From 3a8512d7bc360196e5e3aedb65950008cbbed00f Mon Sep 17 00:00:00 2001 From: Tiago Jesu Date: Wed, 7 Nov 2018 10:17:14 +0000 Subject: [PATCH] removed expected_dict and hardcoded tmp dir and whitespace --- flowcraft/templates/trimmomatic_report.py | 2 +- .../tests/template_tests/test_pATLAS_consensus_json.py | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/flowcraft/templates/trimmomatic_report.py b/flowcraft/templates/trimmomatic_report.py index aa83e7fc..11ec2cd5 100644 --- a/flowcraft/templates/trimmomatic_report.py +++ b/flowcraft/templates/trimmomatic_report.py @@ -41,7 +41,7 @@ except ImportError: from flowcraft.templates.flowcraft_utils.flowcraft_base import get_logger, \ MainWrapper - + logger = get_logger(__file__) diff --git a/flowcraft/tests/template_tests/test_pATLAS_consensus_json.py b/flowcraft/tests/template_tests/test_pATLAS_consensus_json.py index 5ba42905..39413e23 100644 --- a/flowcraft/tests/template_tests/test_pATLAS_consensus_json.py +++ b/flowcraft/tests/template_tests/test_pATLAS_consensus_json.py @@ -3,14 +3,6 @@ import pytest import flowcraft.templates.pATLAS_consensus_json as pATLAS_consensus_json -# the expected result from loading the dictionary in the generated file -expected_dict = {"ACC1": - {"/tmp/pytest-of-tiago/pytest-1/test_generated_dict0/" - "mash_file.txt": ["0.9", "1"], - "/tmp/pytest-of-tiago/pytest-1/test_generated_dict0/" - "test_depth_file.txt": 0.9} - } - @pytest.fixture def fetch_file(tmpdir, request): @@ -60,7 +52,7 @@ def test_generated_dict_contents1(fetch_file): Checks if accession in both expected and result dict is the same """ result_dict = fetch_file - assert list(result_dict.keys())[0] == list(expected_dict.keys())[0] + assert list(result_dict.keys())[0] == "ACC1" def test_generated_dict_contents2(fetch_file):