From b59075b7e2944c51827d685cc9e04bcbecc2f2c5 Mon Sep 17 00:00:00 2001 From: "raphael.lafrance@gmail.com" Date: Sat, 9 Feb 2019 15:17:09 -0500 Subject: [PATCH] Fix broken tests --- lib/assemblers/base.py | 2 +- tests/lib/assemblers/test_base.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/assemblers/base.py b/lib/assemblers/base.py index cc3d87d..07eed88 100644 --- a/lib/assemblers/base.py +++ b/lib/assemblers/base.py @@ -26,7 +26,7 @@ def __init__(self, args, cxn): 'query_target': '', # Original name of the query sequence 'query_file': '', # Current query file name 'blast_db': '', # Current blast DB name - 'iter_dir': '', # Name of the temp dir for this interation + 'iter_dir': '', # Name of the temp dir for this iteration 'cxn': cxn} # Save the DB connection def init_iteration(self, blast_db, query_file, iteration): diff --git a/tests/lib/assemblers/test_base.py b/tests/lib/assemblers/test_base.py index 85a4543..ff77c99 100644 --- a/tests/lib/assemblers/test_base.py +++ b/tests/lib/assemblers/test_base.py @@ -66,12 +66,12 @@ def test_setup_files_01(): assert asm.state['iter_dir'] == iter_dir assert asm.file['long_reads'] == '' - assert asm.file['output'] == join(iter_dir, 'output.fasta') - assert asm.file['paired_1'] == join(iter_dir, 'paired_1.fasta') - assert asm.file['paired_2'] == join(iter_dir, 'paired_2.fasta') - assert asm.file['single_1'] == join(iter_dir, 'single_1.fasta') - assert asm.file['single_2'] == join(iter_dir, 'single_2.fasta') - assert asm.file['single_any'] == join(iter_dir, 'single_any.fasta') + assert asm.file['output'].endswith(join(iter_dir, 'output.fasta')) + assert asm.file['paired_1'].endswith(join(iter_dir, 'paired_1.fasta')) + assert asm.file['paired_2'].endswith(join(iter_dir, 'paired_2.fasta')) + assert asm.file['single_1'].endswith(join(iter_dir, 'single_1.fasta')) + assert asm.file['single_2'].endswith(join(iter_dir, 'single_2.fasta')) + assert asm.file['single_any'].endswith(join(iter_dir, 'single_any.fasta')) assert asm.file['paired_count'] == 0 assert asm.file['single_1_count'] == 0 assert asm.file['single_2_count'] == 0 @@ -94,7 +94,7 @@ def test_iter_file_01(): file_name = 'my_file.txt' asm = build_assembler() expected = join(asm.state['iter_dir'], file_name) - assert asm.iter_file(file_name) == expected + assert asm.iter_file(file_name).endswith(expected) def test_work_path_01(): """It builds the work directory."""