Commit 587f28f7 authored by Theophile GENTILHOMME's avatar Theophile GENTILHOMME
Browse files

[test_commands] Change assert to assert_clikc_runner_result

parent f97e3312
Pipeline #21822 passed with stage
in 22 minutes and 50 seconds
...@@ -6,6 +6,7 @@ import click ...@@ -6,6 +6,7 @@ import click
from click.testing import CliRunner from click.testing import CliRunner
import pkg_resources import pkg_resources
from ..script import commands from ..script import commands
from bob.extension.scripts.click_helper import assert_click_runner_result
def test_metrics(): def test_metrics():
dev1 = pkg_resources.resource_filename('bob.bio.base.test', dev1 = pkg_resources.resource_filename('bob.bio.base.test',
...@@ -15,7 +16,7 @@ def test_metrics(): ...@@ -15,7 +16,7 @@ def test_metrics():
with runner.isolated_filesystem(): with runner.isolated_filesystem():
with open('tmp', 'w') as f: with open('tmp', 'w') as f:
f.write(result.output) f.write(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
dev2 = pkg_resources.resource_filename('bob.bio.base.test', dev2 = pkg_resources.resource_filename('bob.bio.base.test',
'data/dev-5col.txt') 'data/dev-5col.txt')
test1 = pkg_resources.resource_filename('bob.bio.base.test', test1 = pkg_resources.resource_filename('bob.bio.base.test',
...@@ -28,19 +29,19 @@ def test_metrics(): ...@@ -28,19 +29,19 @@ def test_metrics():
) )
with open('tmp', 'w') as f: with open('tmp', 'w') as f:
f.write(result.output) f.write(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke( result = runner.invoke(
commands.metrics, ['-e', '-l', 'tmp', '-lg', 'A,B', commands.metrics, ['-e', '-l', 'tmp', '-lg', 'A,B',
dev1, test1, dev2, test2] dev1, test1, dev2, test2]
) )
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke( result = runner.invoke(
commands.metrics, ['-e', '-l', 'tmp', dev1, test2] commands.metrics, ['-e', '-l', 'tmp', dev1, test2]
) )
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke( result = runner.invoke(
...@@ -48,7 +49,7 @@ def test_metrics(): ...@@ -48,7 +49,7 @@ def test_metrics():
'--criterion', 'mindcf', '--cost', 0.9, '--criterion', 'mindcf', '--cost', 0.9,
dev1, test2] dev1, test2]
) )
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke( result = runner.invoke(
...@@ -56,34 +57,34 @@ def test_metrics(): ...@@ -56,34 +57,34 @@ def test_metrics():
'--criterion', 'mindcf', '--cost', 0.9, '--criterion', 'mindcf', '--cost', 0.9,
dev1] dev1]
) )
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke( result = runner.invoke(
commands.metrics, ['-e', '--criterion', 'cllr', dev1, test2] commands.metrics, ['-e', '--criterion', 'cllr', dev1, test2]
) )
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke( result = runner.invoke(
commands.metrics, ['-l', 'tmp', '--criterion', 'cllr', commands.metrics, ['-l', 'tmp', '--criterion', 'cllr',
'--cost', 0.9, dev1] '--cost', 0.9, dev1]
) )
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke( result = runner.invoke(
commands.metrics, ['-e', '--criterion', 'rr', '-T', commands.metrics, ['-e', '--criterion', 'rr', '-T',
'0.1', dev1, test2] '0.1', dev1, test2]
) )
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke( result = runner.invoke(
commands.metrics, ['-l', 'tmp', '--criterion', 'rr', commands.metrics, ['-l', 'tmp', '--criterion', 'rr',
dev1, dev2] dev1, dev2]
) )
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
...@@ -96,7 +97,7 @@ def test_roc(): ...@@ -96,7 +97,7 @@ def test_roc():
'test.pdf',dev1]) 'test.pdf',dev1])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
dev2 = pkg_resources.resource_filename('bob.bio.base.test', dev2 = pkg_resources.resource_filename('bob.bio.base.test',
'data/dev-5col.txt') 'data/dev-5col.txt')
test1 = pkg_resources.resource_filename('bob.bio.base.test', test1 = pkg_resources.resource_filename('bob.bio.base.test',
...@@ -110,7 +111,7 @@ def test_roc(): ...@@ -110,7 +111,7 @@ def test_roc():
dev1, test1, dev2, test2]) dev1, test1, dev2, test2])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke(commands.roc, ['--output', result = runner.invoke(commands.roc, ['--output',
...@@ -119,7 +120,7 @@ def test_roc(): ...@@ -119,7 +120,7 @@ def test_roc():
dev1, test1, dev2, test2]) dev1, test1, dev2, test2])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
dev_nonorm = pkg_resources.resource_filename('bob.bio.base.test', dev_nonorm = pkg_resources.resource_filename('bob.bio.base.test',
'data/scores-nonorm-dev') 'data/scores-nonorm-dev')
...@@ -134,7 +135,7 @@ def test_roc(): ...@@ -134,7 +135,7 @@ def test_roc():
]) ])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
...@@ -146,7 +147,7 @@ def test_det(): ...@@ -146,7 +147,7 @@ def test_det():
result = runner.invoke(commands.det, [dev1, '-S']) result = runner.invoke(commands.det, [dev1, '-S'])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
dev2 = pkg_resources.resource_filename('bob.bio.base.test', dev2 = pkg_resources.resource_filename('bob.bio.base.test',
'data/dev-5col.txt') 'data/dev-5col.txt')
test1 = pkg_resources.resource_filename('bob.bio.base.test', test1 = pkg_resources.resource_filename('bob.bio.base.test',
...@@ -160,14 +161,14 @@ def test_det(): ...@@ -160,14 +161,14 @@ def test_det():
dev1, test1, dev2, test2]) dev1, test1, dev2, test2])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke(commands.det, ['--output', result = runner.invoke(commands.det, ['--output',
'test.pdf', '-e', 'test.pdf', '-e',
dev1, test1, dev2, test2]) dev1, test1, dev2, test2])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
dev_nonorm = pkg_resources.resource_filename('bob.bio.base.test', dev_nonorm = pkg_resources.resource_filename('bob.bio.base.test',
...@@ -183,7 +184,7 @@ def test_det(): ...@@ -183,7 +184,7 @@ def test_det():
]) ])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
def test_epc(): def test_epc():
...@@ -196,7 +197,7 @@ def test_epc(): ...@@ -196,7 +197,7 @@ def test_epc():
result = runner.invoke(commands.epc, [dev1, test1]) result = runner.invoke(commands.epc, [dev1, test1])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
dev2 = pkg_resources.resource_filename('bob.bio.base.test', dev2 = pkg_resources.resource_filename('bob.bio.base.test',
'data/dev-4col.tar.gz') 'data/dev-4col.tar.gz')
test2 = pkg_resources.resource_filename('bob.bio.base.test', test2 = pkg_resources.resource_filename('bob.bio.base.test',
...@@ -207,7 +208,7 @@ def test_epc(): ...@@ -207,7 +208,7 @@ def test_epc():
dev1, test1, dev2, test2]) dev1, test1, dev2, test2])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
dev_nonorm = pkg_resources.resource_filename('bob.bio.base.test', dev_nonorm = pkg_resources.resource_filename('bob.bio.base.test',
'data/scores-nonorm-dev') 'data/scores-nonorm-dev')
...@@ -221,7 +222,7 @@ def test_epc(): ...@@ -221,7 +222,7 @@ def test_epc():
]) ])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
...@@ -239,7 +240,7 @@ def test_hist(): ...@@ -239,7 +240,7 @@ def test_hist():
result = runner.invoke(commands.hist, [dev1]) result = runner.invoke(commands.hist, [dev1])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke(commands.hist, ['--criterion', 'min-hter', '--output', result = runner.invoke(commands.hist, ['--criterion', 'min-hter', '--output',
...@@ -247,7 +248,7 @@ def test_hist(): ...@@ -247,7 +248,7 @@ def test_hist():
'30,auto', dev1, dev2]) '30,auto', dev1, dev2])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
with runner.isolated_filesystem(): with runner.isolated_filesystem():
result = runner.invoke(commands.hist, ['--criterion', 'eer', '--output', result = runner.invoke(commands.hist, ['--criterion', 'eer', '--output',
...@@ -256,7 +257,7 @@ def test_hist(): ...@@ -256,7 +257,7 @@ def test_hist():
test2]) test2])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
...@@ -268,7 +269,7 @@ def test_cmc(): ...@@ -268,7 +269,7 @@ def test_cmc():
result = runner.invoke(commands.cmc, [dev1]) result = runner.invoke(commands.cmc, [dev1])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
test1 = pkg_resources.resource_filename('bob.bio.base.test', test1 = pkg_resources.resource_filename('bob.bio.base.test',
'data/scores-cmc-4col.txt') 'data/scores-cmc-4col.txt')
with runner.isolated_filesystem(): with runner.isolated_filesystem():
...@@ -278,7 +279,7 @@ def test_cmc(): ...@@ -278,7 +279,7 @@ def test_cmc():
dev1, test1, dev1, test1]) dev1, test1, dev1, test1])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
dev_nonorm = pkg_resources.resource_filename('bob.bio.base.test', dev_nonorm = pkg_resources.resource_filename('bob.bio.base.test',
'data/scores-nonorm-dev') 'data/scores-nonorm-dev')
...@@ -292,7 +293,7 @@ def test_cmc(): ...@@ -292,7 +293,7 @@ def test_cmc():
]) ])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
...@@ -305,7 +306,7 @@ def test_dir(): ...@@ -305,7 +306,7 @@ def test_dir():
result = runner.invoke(commands.dir, [dev1, '--rank', 2]) result = runner.invoke(commands.dir, [dev1, '--rank', 2])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
test1 = pkg_resources.resource_filename('bob.bio.base.test', test1 = pkg_resources.resource_filename('bob.bio.base.test',
'data/scores-nonorm-openset-dev') 'data/scores-nonorm-openset-dev')
with runner.isolated_filesystem(): with runner.isolated_filesystem():
...@@ -315,4 +316,4 @@ def test_dir(): ...@@ -315,4 +316,4 @@ def test_dir():
dev1, test1, dev1, test1]) dev1, test1, dev1, test1])
if result.output: if result.output:
click.echo(result.output) click.echo(result.output)
assert result.exit_code == 0, (result.exit_code, result.output) assert_click_runner_result(result)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment