Merge ~raharper/curtin:fix/tox-for-xenial into curtin:master

[Ryan Harper]

tox: add xenial specific environment to catch build failures

Add a tox environment that matches the Xenial build environment.
This demonstrates an existing failure where a unittest uses
mock.assert_called() which is not present in mock 1.3.0.

Replace use of mock.assert_called() with mock.call_count.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:2ce1ce579f6fcf2dd979e56e85f1cc9161df596c
https://jenkins.ubuntu.com/server/job/curtin-ci/940/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/940
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/940
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/940
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/940

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/940/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

I don't know if yours was first or mine was first. I hadnt seen yours when I did mine.

Anyway...
 https://code.launchpad.net/~smoser/curtin/+git/curtin/+merge/345947

is currently being landed so, i'm just marking this merged.

diff --git a/tests/unittests/test_commands_block_meta.py b/tests/unittests/test_commands_block_meta.py
index 17186d4..a9d9539 100644
--- a/tests/unittests/test_commands_block_meta.py
+++ b/tests/unittests/test_commands_block_meta.py
@@ -680,7 +680,7 @@ class TestFstabData(CiTestCase):
             call(['mount', "-t", "ext4", "-o", "defaults",
                   "/dev/disk1", "/mnt"], capture=True),
             m_subp.call_args)
-        m_ensure_dir.assert_called()
+        self.assertNotEqual(0, m_ensure_dir.call_count)
 
     def _check_mount_fstab_subp(self, fdata, expected, target=None):
         # expected currently is like: mount <device> <mp>
diff --git a/tox.ini b/tox.ini
index c1748c3..62c4577 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py27, py3, py3-flake8, py3-pylint, py27-pylint, trusty-check, trusty-py27, trusty-py3
+envlist = py27, py3, py3-flake8, py3-pylint, py27-pylint, xenial-check, xenial-py27, xenial-py3, trusty-check, trusty-py27, trusty-py3
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
@@ -91,6 +91,36 @@ basepython = python3
 commands = {envpython} {toxinidir}/tools/noproxy nosetests \
     {posargs:tests/unittests}
 
+[testenv:xenial]
+# this environment provides roughly a xenial build environment where
+# where 'make check' is run during package build.  This protects against
+# package build errors on xenial where pep8 and pyflakes there have subtly
+# different behavior.  Note, we do only run pyflakes3, though.
+deps = pyflakes==1.1.0
+   pep8==1.7.0
+   mock==1.3.0
+   nose==1.3.7
+   pyyaml==3.11
+   oauthlib==1.0.3
+
+[testenv:xenial-check]
+deps = {[testenv:xenial]deps}
+basepython = python3
+commands =
+   {toxinidir}/tools/run-pyflakes3 {posargs}
+
+[testenv:xenial-py27]
+deps = {[testenv:xenial]deps}
+basepython = python2.7
+commands = {envpython} {toxinidir}/tools/noproxy nosetests \
+    {posargs:tests/unittests}
+
+[testenv:xenial-py3]
+deps = {[testenv:xenial]deps}
+basepython = python3
+commands = {envpython} {toxinidir}/tools/noproxy nosetests \
+    {posargs:tests/unittests}
+
 [testenv:tip-pycodestyle]
 commands = {envpython} -m pycodestyle {posargs:curtin/ tests/ tools/}
 deps = pycodestyle