From 1071b9940b4e114cd2eabf290b739f92fbab33de Mon Sep 17 00:00:00 2001 From: Wesley Wiedenmeier Date: Sun, 28 Aug 2016 17:56:17 -0500 Subject: Improve module documentation and doc cleanup. This adds lots of config module documentation in a standard format. It will greatly improve the content at readthedocs. Additionally: * Add a 'doc' env to tox.ini * Changed default highlight language for sphinx conf from python to yaml most examples in documentation are yaml configs * Updated datasource examples to highlight sh code properly --- tox.ini | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index e7a6f22c..9424ae51 100644 --- a/tox.ini +++ b/tox.ini @@ -28,3 +28,9 @@ setenv = [flake8] ignore=H404,H405,H105,H301,H104,H403,H101 exclude = .venv,.tox,dist,doc,*egg,.git,build,tools + +[testenv:doc] +basepython = python3 +deps = {[testenv]deps} + sphinx +commands = {envpython} -m sphinx {posargs:doc/rtd doc/rtd_html} -- cgit v1.2.3 From 760a4f1852ee7241c00804ebf210b6a4b1e9063d Mon Sep 17 00:00:00 2001 From: Ryan Harper Date: Tue, 4 Oct 2016 09:56:10 -0500 Subject: unittests: fix use of mock 2.0 'assert_called' when running make check Some of the new DigitalOcean unittests were written to use 'assert_called', which is only available in mock versions 2.0. Because of this, the failure would only occur in releases less than yakkety and not in 'tox'. Add a 'xenial' entry to tox.ini with versions from xenial. --- .../unittests/test_datasource/test_digitalocean.py | 6 ++--- tox.ini | 27 +++++++++++++++++++++- 2 files changed, 29 insertions(+), 4 deletions(-) (limited to 'tox.ini') diff --git a/tests/unittests/test_datasource/test_digitalocean.py b/tests/unittests/test_datasource/test_digitalocean.py index bdfe0ba2..7bde0820 100644 --- a/tests/unittests/test_datasource/test_digitalocean.py +++ b/tests/unittests/test_datasource/test_digitalocean.py @@ -162,7 +162,7 @@ class TestDataSourceDigitalOcean(TestCase): m_read_sysinfo.return_value = (False, None) ds = self.get_ds(get_sysinfo=None) self.assertEqual(False, ds.get_data()) - m_read_sysinfo.assert_called() + self.assertTrue(m_read_sysinfo.called) @mock.patch('cloudinit.sources.helpers.digitalocean.read_metadata') def test_metadata(self, mock_readmd): @@ -172,7 +172,7 @@ class TestDataSourceDigitalOcean(TestCase): ret = ds.get_data() self.assertTrue(ret) - mock_readmd.assert_called() + self.assertTrue(mock_readmd.called) self.assertEqual(DO_META.get('user_data'), ds.get_userdata_raw()) self.assertEqual(DO_META.get('vendor_data'), ds.get_vendordata_raw()) @@ -196,7 +196,7 @@ class TestDataSourceDigitalOcean(TestCase): ret = ds.get_data() self.assertTrue(ret) - mock_readmd.assert_called() + self.assertTrue(mock_readmd.called) # Multiple keys self.assertEqual(metadata['public_keys'], ds.get_public_ssh_keys()) diff --git a/tox.ini b/tox.ini index 9424ae51..729de2a6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27,py3,flake8 +envlist = py27, py3, flake8, xenial recreate = True [testenv] @@ -34,3 +34,28 @@ basepython = python3 deps = {[testenv]deps} sphinx commands = {envpython} -m sphinx {posargs:doc/rtd doc/rtd_html} + +[testenv:xenial] +basepython = python3 +deps = + # requirements + jinja2==2.8 + pyyaml==3.11 + PrettyTable==0.7.2 + oauthlib==1.0.3 + pyserial==3.0.1 + configobj==5.0.6 + requests==2.9.1 + # jsonpatch ubuntu is 1.10, not 1.19 (#839779) + jsonpatch==1.10 + six==1.10.0 + # test-requirements + httpretty==0.8.6 + mock==1.3.0 + nose==1.3.7 + unittest2==1.1.0 + contextlib2==0.5.1 + pep8==1.7.0 + pyflakes==1.1.0 + flake8==2.5.4 + hacking==0.10.2 -- cgit v1.2.3