Skip to content

Commit

Permalink
fix k=19 => k=57 everywhere else, too
Browse files Browse the repository at this point in the history
  • Loading branch information
ctb committed Jun 12, 2020
1 parent 20d5cf5 commit 59a6fb8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
Binary file added tests/test-data/prot/dayhoff.sbt.zip
Binary file not shown.
Binary file added tests/test-data/prot/hp.sbt.zip
Binary file not shown.
Binary file added tests/test-data/prot/protein.sbt.zip
Binary file not shown.
6 changes: 3 additions & 3 deletions tests/test_cmd_signature.py
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@ def test_sig_describe_protein(c):
testdata = utils.get_test_data('prot/protein/GCA_001593925.1_ASM159392v1_protein.faa.gz.sig')
c.run_sourmash('sig', 'describe', testdata)

assert 'k=19 molecule=protein num=0 scaled=100 seed=42 track_abundance=0' in c.last_result.out
assert 'k=57 molecule=protein num=0 scaled=100 seed=42 track_abundance=0' in c.last_result.out


@utils.in_thisdir
Expand All @@ -802,7 +802,7 @@ def test_sig_describe_hp(c):
testdata = utils.get_test_data('prot/hp/GCA_001593925.1_ASM159392v1_protein.faa.gz.sig')
c.run_sourmash('sig', 'describe', testdata)

assert 'k=19 molecule=hp num=0 scaled=1 seed=42 track_abundance=0' in c.last_result.out
assert 'k=57 molecule=hp num=0 scaled=100 seed=42 track_abundance=0' in c.last_result.out


@utils.in_thisdir
Expand All @@ -811,7 +811,7 @@ def test_sig_describe_dayhoff(c):
testdata = utils.get_test_data('prot/dayhoff/GCA_001593925.1_ASM159392v1_protein.faa.gz.sig')
c.run_sourmash('sig', 'describe', testdata)

assert 'k=19 molecule=dayhoff num=0 scaled=100 seed=42 track_abundance=0' in c.last_result.out
assert 'k=57 molecule=dayhoff num=0 scaled=100 seed=42 track_abundance=0' in c.last_result.out


@utils.in_tempdir
Expand Down
9 changes: 6 additions & 3 deletions tests/test_sbt.py
Original file line number Diff line number Diff line change
Expand Up @@ -784,9 +784,10 @@ def test_sbt_protein_command_index(c):
sigfile2 = utils.get_test_data('prot/protein/GCA_001593935.1_ASM159393v1_protein.faa.gz.sig')

db_out = c.output('protein.sbt.zip')
db_out = '/tmp/protein.sbt.zip'

c.run_sourmash('index', db_out, sigfile1, sigfile2,
'--scaled', '100', '-k', '19', '--protein')
'--scaled', '100', '-k', '57', '--protein')

db2 = sourmash.load_sbt_index(db_out)

Expand Down Expand Up @@ -830,9 +831,10 @@ def test_sbt_hp_command_index(c):
sigfile2 = utils.get_test_data('prot/hp/GCA_001593935.1_ASM159393v1_protein.faa.gz.sig')

db_out = c.output('hp.sbt.zip')
db_out = '/tmp/hp.sbt.zip'

c.run_sourmash('index', db_out, sigfile1, sigfile2,
'--scaled', '1', '-k', '19', '--hp')
'--scaled', '100', '-k', '57', '--hp')

db2 = sourmash.load_sbt_index(db_out)

Expand Down Expand Up @@ -876,9 +878,10 @@ def test_sbt_dayhoff_command_index(c):
sigfile2 = utils.get_test_data('prot/dayhoff/GCA_001593935.1_ASM159393v1_protein.faa.gz.sig')

db_out = c.output('dayhoff.sbt.zip')
db_out = '/tmp/dayhoff.sbt.zip'

c.run_sourmash('index', db_out, sigfile1, sigfile2,
'--scaled', '100', '-k', '19', '--dayhoff')
'--scaled', '100', '-k', '57', '--dayhoff')

db2 = sourmash.load_sbt_index(db_out)

Expand Down

0 comments on commit 59a6fb8

Please sign in to comment.