diff --git a/requirements.txt b/requirements.txt index 46b9068..e1b2d3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ black==19.3b0 click==7.0 coveralls==1.7.0 -hypothesis==3.69.2 -isort==4.3.16 -mypy==0.670 +hypothesis==4.14.6 +isort==4.3.17 +mypy==0.700 pylint==2.3.1 -pytest==4.3.0 +pytest==4.4.1 pytest-cov==2.6.1 pytest-runner==4.4 stringcase==1.2.0 diff --git a/setup.py b/setup.py index a4bf903..76b83eb 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name="zfs-replicate", - version="1.1.3", + version="1.1.4", description="ZFS Snapshot Replicator", long_description=README, url="https://github.com/alunduil/zfs-replicate", diff --git a/zfs_test/replicate_test/cli_test/main_test.py b/zfs_test/replicate_test/cli_test/main_test.py index cfcacbc..b6b82a5 100644 --- a/zfs_test/replicate_test/cli_test/main_test.py +++ b/zfs_test/replicate_test/cli_test/main_test.py @@ -1,4 +1,4 @@ -from click.testing import CliRunner +from click.testing import CliRunner, Result from zfs.replicate.cli.main import main @@ -8,4 +8,20 @@ def test_invokes_without_stacktrace() -> None: runner = CliRunner() result = runner.invoke(main, ["-l", "alunduil", "-i", "mypy.ini", "example.com", "bogus", "bogus"]) - assert isinstance(result.exception, SystemExit), "Expected normal exit." + assert isinstance(result.exception, SystemExit) or file_not_found_error( + result + ), "Expected SystemExit or FileNotFoundError." + + +def test_invokes_without_stacktrace_verbose() -> None: + """zfs-replicate --verbose -l alunduil -i mypy.ini example.com bogus bogus => No stacktrace""" + + runner = CliRunner() + result = runner.invoke(main, ["--verbose", "-l", "alunduil", "-i", "mypy.ini", "example.com", "bogus", "bogus"]) + assert isinstance(result.exception, SystemExit) or file_not_found_error( + result + ), "Expected SystemExit or FileNotFoundError." + + +def file_not_found_error(result: Result) -> bool: + return bool(FileNotFoundError(2, "No such file or directory: '/usr/bin/env'") == result.exception) diff --git a/zfs_test/replicate_test/task_test/generate_test.py b/zfs_test/replicate_test/task_test/generate_test.py new file mode 100644 index 0000000..2580d1b --- /dev/null +++ b/zfs_test/replicate_test/task_test/generate_test.py @@ -0,0 +1,8 @@ +from zfs.replicate.filesystem.type import filesystem +from zfs.replicate.task.generate import * # pylint: disable=unused-wildcard-import,wildcard-import + + +def test_no_tasks() -> None: + """generate(Any, {}, {}) == []""" + + assert [] == generate(filesystem("pool/filesystem"), {}, {})