some test fixes and also self-check fix

Author: r1chardj0n3s

pip_missing_reqs/find_missing_reqs.py

@@ -248,12 +248,15 @@ def main():
     options.ignore_files = ignorer(options.ignore_files)
     options.ignore_mods = ignorer(options.ignore_mods)
 
-    options.paths = args or ['.']
+    options.paths = args
 
     logging.basicConfig(format='%(message)s')
     log.setLevel(logging.INFO if options.verbose else logging.WARN)
 
     missing = find_missing_reqs(options)
+
+    if missing:
+        log.warning('Missing requirements:')
     for name, uses in missing:
         for use in uses:
             for filename, lineno in use.locations:

pip_missing_reqs/test_find_missing_reqs.py

@@ -14,6 +14,31 @@
 from . import find_missing_reqs
 
 
+@pytest.fixture
+def fake_opts():
+
+    class FakeOptParse:
+        class options:
+            paths = ['dummy']
+            verbose = True
+            version = False
+            ignore_files = []
+            ignore_mods = []
+        options = options()
+        args = ['ham.py']
+
+        def __init__(self, usage):
+            pass
+
+        def add_option(*args, **kw):
+            pass
+
+        def parse_args(self):
+            return (self.options, self.args)
+
+    return FakeOptParse
+
+
 @pytest.mark.parametrize(["path", "result"], [
     ('/', ''),
     ('__init__.py', ''),    # a top-level file like this has no package name
@@ -182,25 +207,8 @@ def test_find_missing_reqs(monkeypatch):
     assert result == [('shrub', [imported_modules['shrub']])]
 
 
-def test_main_failure(monkeypatch, caplog):
-    class options:
-        paths = ['dummy']
-        verbose = True
-        ignore_files = []
-        ignore_mods = []
-    options = options()
-
-    class FakeOptParse:
-        def __init__(self, usage):
-            pass
-
-        def add_option(*args, **kw):
-            pass
-
-        def parse_args(self):
-            return (options, ['ham.py'])
-
-    monkeypatch.setattr(optparse, 'OptionParser', FakeOptParse)
+def test_main_failure(monkeypatch, caplog, fake_opts):
+    monkeypatch.setattr(optparse, 'OptionParser', fake_opts)
 
     caplog.setLevel(logging.WARN)
 
@@ -214,32 +222,22 @@ def parse_args(self):
         assert excinfo.value == 1
 
     assert caplog.records()[0].message == \
+        'Missing requirements:'
+    assert caplog.records()[1].message == \
         'location.py:1 dist=missing module=missing'
 
 
-def test_main_no_spec(monkeypatch, caplog):
-    class FakeOptParse:
-        def __init__(self, usage):
-            pass
-
-        def add_option(*args, **kw):
-            pass
-
-        def parse_args(self):
-            return (None, [])
-
-        error = pretend.call_recorder(lambda *a: None)
-
-    monkeypatch.setattr(optparse, 'OptionParser', FakeOptParse)
-    monkeypatch.setattr(find_missing_reqs, 'ignorer',
-        pretend.call_recorder(lambda a: None))
+def test_main_no_spec(monkeypatch, caplog, fake_opts):
+    fake_opts.args = []
+    monkeypatch.setattr(optparse, 'OptionParser', fake_opts)
+    monkeypatch.setattr(fake_opts, 'error',
+        pretend.call_recorder(lambda s, e: None), raising=False)
 
     with pytest.raises(SystemExit) as excinfo:
         find_missing_reqs.main()
         assert excinfo.value == 2
 
-    assert FakeOptParse.error.calls
-    assert not find_missing_reqs.ignorer.calls
+    assert fake_opts.error.calls
 
 
 @pytest.mark.parametrize(["ignore_cfg", "candidate", "result"], [
@@ -267,6 +265,7 @@ def test_logging_config(monkeypatch, caplog, verbose_cfg, events, result):
     class options:
         paths = ['dummy']
         verbose = verbose_cfg
+        version = False
         ignore_files = []
         ignore_mods = []
     options = options()
@@ -291,3 +290,12 @@ def parse_args(self):
 
     messages = [r.message for r in caplog.records()]
     assert messages == result
+
+
+def test_main_version(monkeypatch, caplog, fake_opts):
+    fake_opts.options.version = True
+    monkeypatch.setattr(optparse, 'OptionParser', fake_opts)
+
+    with pytest.raises(SystemExit) as excinfo:
+        find_missing_reqs.main()
+        assert excinfo.value == 'version'

tox.ini

@@ -24,7 +24,6 @@ deps = flake8
 commands = flake8 pip_missing_reqs
 
 [testenv:pip-missing-reqs]
-deps = pip_missing_reqs
-commands = pip-missing-reqs --ignore-file=pip_missing_reqs/test* \
-    pip_missing_reqs
+commands = python -m pip_missing_reqs.find_missing_reqs \
+    --ignore-file=pip_missing_reqs/test* pip_missing_reqs