merge from master at 0.7.8-34-ga1cdebd

1 files changed, 51 insertions, 1 deletions

diff --git a/tox.ini b/tox.ini
index e7a6f22c..08318a9f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py3,flake8
+envlist = py27, py3, flake8, xenial
 recreate = True
 
 [testenv]
@@ -19,6 +19,9 @@ setenv =
 
 [testenv:py3]
 basepython = python3
+commands = {envpython} -m nose \
+    {posargs:--with-coverage --cover-erase \
+        --cover-branches --cover-package=cloudinit --cover-inclusive}
 
 [testenv:py26]
 commands = nosetests {posargs:tests}
@@ -28,3 +31,50 @@ 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}
+
+[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
+
+[testenv:centos6]
+basepython = python2.6
+commands = nosetests {posargs:tests}
+deps =
+    # requirements
+    argparse==1.2.1
+    jinja2==2.2.1
+    pyyaml==3.10
+    PrettyTable==0.7.2
+    oauthlib==0.6.0
+    configobj==4.6.0
+    requests==2.6.0
+    jsonpatch==1.2
+    six==1.9.0
+    -r{toxinidir}/test-requirements.txt