From 754f54037aca0f604b8b57ab71b30dad5e5066cf Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Mon, 12 Feb 2018 13:54:50 -0700
Subject: tests: run nosetests in cloudinit/ directory, fix py26 fallout.

When we moved some tests to live under cloudinit/ we inadvertantly
failed to change all things that would run nose to include that
directory.

This changes all the 'nose' invocations to consistently run with
tests/unittests and cloudinit/.

Also, it works around, more correctly this time, a python2.6-ism with
the following code:
   with assertRaises(SystemExit) as cm:
      sys.exit(2)
---
 tox.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index bb74853f..1f990af4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,7 +45,7 @@ deps = -r{toxinidir}/test-requirements.txt
 
 [testenv:py26]
 deps = -r{toxinidir}/test-requirements.txt
-commands = nosetests {posargs:tests/unittests}
+commands = nosetests {posargs:tests/unittests cloudinit}
 setenv =
     LC_ALL = C
 
@@ -83,7 +83,7 @@ deps =
 
 [testenv:centos6]
 basepython = python2.6
-commands = nosetests {posargs:tests/unittests}
+commands = nosetests {posargs:tests/unittests cloudinit}
 deps =
     # requirements
     argparse==1.2.1
@@ -98,7 +98,7 @@ deps =
 
 [testenv:opensusel42]
 basepython = python2.7
-commands = nosetests {posargs:tests/unittests}
+commands = nosetests {posargs:tests/unittests cloudinit}
 deps =
     # requirements
     argparse==1.3.0
-- 
cgit v1.2.3


From 68d798bb793052f589a7e48c508aca9031c7e271 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 23 Mar 2018 13:51:17 -0600
Subject: tests: remove jsonschema from xenial tox environment.

Ubuntu 16.04 (xenial) does not have jsonschema installed by default.  As
it is listed in requirements, the tox environment will always have it
installed.

Add the helper tools/pipremove that removes pip packages.  Then use that
to remove jsonschema without noise of always running and ignoring a
'pip uninstall jsonschema'.
---
 tools/pipremove | 14 ++++++++++++++
 tox.ini         |  3 +++
 2 files changed, 17 insertions(+)
 create mode 100755 tools/pipremove

(limited to 'tox.ini')

diff --git a/tools/pipremove b/tools/pipremove
new file mode 100755
index 00000000..f8f4ff11
--- /dev/null
+++ b/tools/pipremove
@@ -0,0 +1,14 @@
+#!/usr/bin/python3
+import subprocess
+import sys
+
+for pkg in sys.argv[1:]:
+    try:
+        exec('import %s' % pkg)  # pylint: disable=W0122
+    except ImportError:
+        continue
+    sys.stderr.write("%s removing package %s\n" % (sys.argv[0], pkg))
+    ret = subprocess.Popen(['pip', 'uninstall', '--yes', pkg]).wait()
+    if ret != 0:
+        sys.stderr.write("Failed to uninstall %s (%d)\n" % (pkg, ret))
+        sys.exit(ret)
diff --git a/tox.ini b/tox.ini
index 1f990af4..818ade3d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,6 +60,9 @@ deps = sphinx
 commands = {envpython} -m sphinx {posargs:doc/rtd doc/rtd_html}
 
 [testenv:xenial]
+commands =
+  python ./tools/pipremove jsonschema
+  python -m nose {posargs:tests/unittests cloudinit}
 basepython = python3
 deps =
     # requirements
-- 
cgit v1.2.3