summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--cloudinit/net/tests/test_dhcp.py3
-rw-r--r--tox.ini2
3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7feea400..4ace2270 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ unittest: clean_pyc
nosetests $(noseopts) tests/unittests cloudinit
unittest3: clean_pyc
- nosetests3 $(noseopts) tests/unittests
+ nosetests3 $(noseopts) tests/unittests cloudinit
ci-deps-ubuntu:
@$(PYVER) $(CWD)/tools/read-dependencies --distro ubuntu --test-distro
diff --git a/cloudinit/net/tests/test_dhcp.py b/cloudinit/net/tests/test_dhcp.py
index 1324c3d0..a38edaec 100644
--- a/cloudinit/net/tests/test_dhcp.py
+++ b/cloudinit/net/tests/test_dhcp.py
@@ -107,7 +107,8 @@ class TestDHCPDiscoveryClean(CiTestCase):
'os.getuid': 0},
maybe_perform_dhcp_discovery)
self.assertEqual({'address': '192.168.2.2'}, retval)
- m_dhcp.assert_called_once()
+ self.assertEqual(
+ 1, m_dhcp.call_count, 'dhcp_discovery not called once')
call = m_dhcp.call_args_list[0]
self.assertEqual('/sbin/dhclient', call[0][0])
self.assertEqual('eth9', call[0][1])
diff --git a/tox.ini b/tox.ini
index 72de9830..776f4253 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist = py27, py3, flake8, xenial, pylint
recreate = True
[testenv]
-commands = python -m nose {posargs:tests/unittests}
+commands = python -m nose {posargs:tests/unittests cloudinit}
setenv =
LC_ALL = en_US.utf-8