Merge pull request #33 from r1chardj0n3s/improve-test-coverage

Improve test coverage

Author: adamtheturtle

.github/workflows/ci.yml

@@ -37,9 +37,9 @@ jobs:
 
       - name: "Run tests"
         run: |
-          # We currently require 94% test coverage and not 100% as this is the
+          # We currently require 96% test coverage and not 100% as this is the
           # level that coverage was at when the CI restriction was introduced.
-          pytest -s -vvv --cov-fail-under 94 --cov=pip_check_reqs/ --cov=tests tests/ --cov-report=xml
+          pytest -s -vvv --cov-fail-under 96 --cov=pip_check_reqs/ --cov=tests tests/ --cov-report=xml
 
       - name: "Upload coverage to Codecov"
         uses: "codecov/codecov-action@v1"

tests/test_common.py

@@ -4,7 +4,6 @@
 import collections
 import logging
 import os.path
-import sys
 
 import pytest
 import pretend
@@ -100,10 +99,6 @@ def test_find_imported_modules(monkeypatch, caplog, ignore_ham, ignore_hashlib,
     monkeypatch.setattr(common, 'pyfiles',
                         pretend.call_recorder(lambda x: ['spam.py', 'ham.py']))
 
-    if sys.version_info[0] == 2:
-        # py2 will find sys module but py3k won't
-        expect.append('sys')
-
     class FakeFile():
         contents = [
             'from os import path\nimport ast, hashlib',

tests/test_find_extra_reqs.py

@@ -7,7 +7,7 @@
 import pytest
 import pretend
 
-from pip_check_reqs import find_extra_reqs, common
+from pip_check_reqs import find_extra_reqs, common, __version__
 
 
 @pytest.fixture
@@ -90,7 +90,8 @@ def test_main_failure(monkeypatch, caplog, fake_opts):
 
     with pytest.raises(SystemExit) as excinfo:
         find_extra_reqs.main()
-        assert excinfo.value == 1
+
+    assert excinfo.value.code == 1
 
     assert caplog.records[0].message == \
         'Extra requirements:'
@@ -108,7 +109,8 @@ def test_main_no_spec(monkeypatch, caplog, fake_opts):
 
     with pytest.raises(SystemExit) as excinfo:
         find_extra_reqs.main()
-        assert excinfo.value == 2
+
+    assert excinfo.value.code == 2
 
     assert fake_opts.error.calls
 
@@ -164,4 +166,5 @@ def test_main_version(monkeypatch, caplog, fake_opts):
 
     with pytest.raises(SystemExit) as excinfo:
         find_extra_reqs.main()
-        assert excinfo.value == 'version'
+
+    assert str(excinfo.value) == __version__

tests/test_find_missing_reqs.py

@@ -7,7 +7,7 @@
 import pytest
 import pretend
 
-from pip_check_reqs import find_missing_reqs, common
+from pip_check_reqs import find_missing_reqs, common, __version__
 
 
 @pytest.fixture
@@ -85,7 +85,8 @@ def test_main_failure(monkeypatch, caplog, fake_opts):
 
     with pytest.raises(SystemExit) as excinfo:
         find_missing_reqs.main()
-        assert excinfo.value == 1
+
+    assert excinfo.value.code == 1
 
     assert caplog.records[0].message == \
         'Missing requirements:'
@@ -103,7 +104,8 @@ def test_main_no_spec(monkeypatch, caplog, fake_opts):
 
     with pytest.raises(SystemExit) as excinfo:
         find_missing_reqs.main()
-        assert excinfo.value == 2
+
+    assert excinfo.value.code == 2
 
     assert fake_opts.error.calls
 
@@ -158,4 +160,5 @@ def test_main_version(monkeypatch, caplog, fake_opts):
 
     with pytest.raises(SystemExit) as excinfo:
         find_missing_reqs.main()
-        assert excinfo.value == 'version'
+
+    assert str(excinfo.value) == __version__