fixes coverage

Author: saxix

.coveragerc

@@ -0,0 +1,15 @@
+[run]
+branch = True
+source = pytest_echo
+
+omit =
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    pragma: no cover
+
+ignore_errors = False
+
+[html]
+directory = ~build/coverage

.gitignore

@@ -2,7 +2,9 @@
 .cache
 .tox
 dist
-*.egg-info
+pytest_echo.egg-info
 *.pyc
 __pycache__
 docs/_build
+.coverage
+~build

pytest_echo.py

@@ -4,18 +4,16 @@
 from pprint import pformat
 
 import pip
+from pkg_resources import DistributionNotFound
 
 __version__ = '1.5'
 
 
-class RetrieveException(Exception):
-    pass
-
-
 def get_attr(obj, attr, default='NOT FOUND'):
     """Recursive get object's attribute. May use dot notation.
 
-    >>> class C(object): pass
+    >>> class C(object):
+    ...     pass
     >>> a = C()
     >>> a.b = C()
     >>> a.b.c = 4
@@ -46,7 +44,7 @@ def get_attr(obj, attr, default='NOT FOUND'):
                 return obj[attr]
             else:
                 return default
-        except Exception as e:
+        except Exception as e:  # pragma: no cover
             return str(e)
     else:
         L = attr.split('.')
@@ -69,6 +67,8 @@ def get_module_attribute(path):
     <type 'dict'>
     >>> print get_module_attribute('os.path.curdir')
     '.'
+    >>> print get_module_attribute('wrong')
+    ('Unable to load %s', 'wrong')
     """
     parts = path.split('.')
     parent = ""
@@ -117,7 +117,7 @@ def _get_version(package_name):
         import pkg_resources
 
         return pkg_resources.require(package_name)[0].version
-    except:
+    except (ImportError, AttributeError, TypeError, DistributionNotFound):
         pass
 
     try:
@@ -141,17 +141,15 @@ def pytest_report_header(config):
         for k in config.option.echo_envs:
             data.extend(get_env(k))
         ret.append("\n".join(["    %s: %s" % (k, v)
-                              for k,v in sorted(data)]))
+                              for k, v in sorted(data)]))
 
-        # ret.append("\n".join(["    %s: %s" % (k, os.environ.get(k, "<not set>"))
-        #                       for k in config.option.echo_envs]))
     if config.option.echo_versions:
         ret.append("Package version:")
         data = []
         for k in config.option.echo_versions:
             data.extend(get_version(k))
         ret.append("\n".join(["    %s: %s" % (k, v)
-                              for k,v in sorted(data)]))
+                              for k, v in sorted(data)]))
 
     if config.option.echo_attribues:
         ret.append("Inspections:")

setup.cfg

@@ -12,3 +12,21 @@ universal=1
 [devpi:upload]
 formats = bdist_wheel,sdist.tgz
 
+[flake8]
+max-line-length = 91
+
+[isort]
+line_length=90
+combine_as_imports = true
+multi_line_output = 5
+default_section = FIRSTPARTY
+indent='    '
+
+known_future_library=
+known_standard_library=
+known_third_party=
+known_first_party=
+
+sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,CONCURRENCY,LOCALFOLDER
+
+

test_echo.py

@@ -2,6 +2,7 @@
 import sys
 from contextlib import contextmanager
 
+import django
 import pytest
 
 import pytest_echo
@@ -46,7 +47,6 @@ def env(**kwargs):
 
 
 def test_echo_env(testdir):
-    # os.environ['PYTESTECHO'] = '123'
     with env(PYTESTECHO='123'):
         result = testdir.runpytest('--echo-env=PYTESTECHO')
         result.stdout.fnmatch_lines([
@@ -55,8 +55,6 @@ def test_echo_env(testdir):
 
 
 def test_echo_env_glob(testdir):
-    # os.environ['PYTESTECHO-a'] = '1'
-    # os.environ['PYTESTECHO-b'] = '2'
     with env(**{'PYTESTECHO-a': '1', 'PYTESTECHO-b': '2'}):
         result = testdir.runpytest('--echo-env=PYTESTECHO*')
         result.stdout.fnmatch_lines([
@@ -70,13 +68,23 @@ def test_echo_version(testdir):
     result.stdout.fnmatch_lines(["    pytest-echo: %s" % pytest_echo.__version__])
 
 
+def test_echo_version_missing(testdir):
+    result = testdir.runpytest('--echo-version=missing-package')
+    result.stdout.fnmatch_lines(["    missing-package: <unable to load package>"])
+
+
+def test_echo_version_no_setuptools(testdir, monkeypatch):
+    monkeypatch.setattr("pkg_resources.require", None)
+    result = testdir.runpytest('--echo-version=pytest', '--echo-version=django')
+    result.stdout.fnmatch_lines(["    pytest: %s" % pytest.__version__])
+    result.stdout.fnmatch_lines(["    django: %s" % django.get_version()])
+
+
 def test_echo_version_glob(testdir):
     result = testdir.runpytest('--echo-version=pytest*')
     result.stdout.fnmatch_lines(["    pytest: %s" % pytest.__version__,
                                  "    pytest-echo: %s" % pytest_echo.__version__,
                                  ])
-    # result.stdout.fnmatch_lines(["    pytest-echo: %s" % pytest_echo.__version__])
-    # result.stdout.fnmatch_lines(["    pytest: %s" % pytest.__version__])
 
 
 def test_echo_all(testdir):

tox.ini

@@ -7,18 +7,23 @@ deps =
     py{34,35,36}: django
     py{33,34}: pytest<3
     py{33,34}: py<1.5
+    coverage
 
 commands =
-    pip install {toxinidir}
-    py.test {posargs}
+;    py.test --pyargs test_echo.py
+    pip install -e .
+    coverage run -m py.test
+    coverage report
+    coverage html
 
 [pytest]
 pep8ignore = E128 E302
     doc/conf.py ALL
-python_files=test_echo.py
+;python_files=test_echo.py
 
 addopts =
         --tb=short
+        --doctest-modules
         --capture=sys
 
 [flake8]