Merge lp:~tribaal/charm-helpers/make-test-great-again into lp:charm-helpers

[Chris Glass]

This branch fixes the project so that invoking "make test" runs the tests successfully on trusty, xenial, yakkety and zesty.

For the record despite comments in the changed files mentioning precise, tests don't run on precise regardless of this branch being merged in or not.

Note: one test fails if juju is not installed, but properly isolating the test (using a mock, for instance) is outside the scope of this MP.

Steps taken to test:
(repeated on trusty, xenial, yakkety and zesty on LXD)

lxc launch ubuntu:<series>
lxc exec <name> /bin/bash
apt update && apt upgrade
apt install bzr make juju # juju is needed because a test is not isolated properly
bzr co lp:~tribaal/charm-helpers/make-test-great-again
cd make-test-great-again
make test

[Stuart Bishop (stub)]

Is good.

review: Approve

[Stuart Bishop (stub)]

For future ideas:
 - I think this would benefit from tox.
 - A cleantest target (or just update test) that uses lxd
 - Some more pinning is needed, in particular there are fails if python-flake8, python-mcabe or python-mock are installed in xenial's system python. Or maybe now we don't have precise we can avoid including system packages in the venv.

=== modified file 'Makefile'
--- Makefile	2016-02-23 18:30:24 +0000
+++ Makefile	2017-01-25 17:40:28 +0000
@@ -40,7 +40,6 @@
 	sudo apt-get install -y gcc python-dev python-virtualenv python-apt
 	virtualenv .venv --system-site-packages
 	.venv/bin/pip install -U pip
-	.venv/bin/pip install -U distribute
 	.venv/bin/pip install -I -r test_requirements.txt
 	.venv/bin/pip install bzr
 
@@ -48,7 +47,6 @@
 	sudo apt-get install -y gcc python3-dev python-virtualenv python3-apt
 	virtualenv .venv3 --python=python3 --system-site-packages
 	.venv3/bin/pip install -U pip
-	.venv3/bin/pip install -U distribute
 	.venv3/bin/pip install -I -r test_requirements.txt
 
 # Note we don't even attempt to run tests if lint isn't passing.
 
=== modified file 'charmhelpers/contrib/network/ip.py'
--- charmhelpers/contrib/network/ip.py	2016-11-07 23:09:58 +0000
+++ charmhelpers/contrib/network/ip.py	2017-01-25 17:40:28 +0000
@@ -426,7 +426,7 @@
 
     try:
         answers = dns.resolver.query(address, rtype)
-    except dns.resolver.NXDOMAIN as e:
+    except dns.resolver.NXDOMAIN:
         return None
 
     if answers:
 
=== modified file 'test_requirements.txt'
--- test_requirements.txt	2016-01-29 09:23:31 +0000
+++ test_requirements.txt	2017-01-25 17:40:28 +0000
@@ -1,7 +1,7 @@
 # Test-only dependencies are unpinned.
 #
 pip
-distribute
+six
 coverage>=3.6
 mock>=1.0.1,<1.1.0
 nose>=1.3.1
@@ -16,5 +16,4 @@
 Tempita==0.5.1     # precise
 netifaces==0.10    # trusty is 0.8, but using py3 compatible version for tests.
 Jinja2==2.6        # precise
-six==1.1           # precise
 psutil==1.2.1      # trusty