Merge ~smoser/curtin:ubuntu/devel-20180607 into curtin:ubuntu/devel

[Scott Moser]

+curtin (18.1-25-g9d0e557e-0ubuntu1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot.
+ - Fix WorkingDir class to support already existing target directory.
+ (LP: #1775622)
+ - Fix extraction of local filesystem image. (LP: #1775630)
+ - Fix tip-pyflakes imported but unused call to util.get_platform_arch
+ - subp: update return value of subp with combine_capture=True.
+ - tox: add a xenial environments, default envlist changes.
+ - tests: Fix race on utcnow during timestamped curtin-log dir creation
+ (LP: #1772481)
+ - curtainer: patch source version from --source.
+ - pyflakes: fix unused variable references identified by pyflakes 2.0.0.
+
+ -- Scott Moser <email address hidden> Thu, 07 Jun 2018 14:59:20 -0400

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

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

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

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

LGTM

review: Approve

diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index d45c3a8..a514560 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -292,7 +292,7 @@ def setup_grub(cfg, target):
     storage_cfg_odict = None
     try:
         storage_cfg_odict = extract_storage_ordered_dict(cfg)
-    except ValueError as e:
+    except ValueError:
         pass
 
     if storage_cfg_odict:
@@ -324,7 +324,7 @@ def setup_grub(cfg, target):
             try:
                 (blockdev, part) = block.get_blockdev_for_partition(maybepart)
                 blockdevs.add(blockdev)
-            except ValueError as e:
+            except ValueError:
                 # if there is no syspath for this device such as a lvm
                 # or raid device, then a ValueError is raised here.
                 LOG.debug("failed to find block device for %s", maybepart)
diff --git a/curtin/commands/extract.py b/curtin/commands/extract.py
index 69a9d18..ec7a791 100644
--- a/curtin/commands/extract.py
+++ b/curtin/commands/extract.py
@@ -59,7 +59,7 @@ def extract_root_tgz_url(url, target):
 def extract_root_fsimage_url(url, target):
     path = _path_from_file_url(url)
     if path != url or os.path.isfile(path):
-        return _extract_root_fsimage(path(url), target)
+        return _extract_root_fsimage(path, target)
 
     wfp = tempfile.NamedTemporaryFile(suffix=".img", delete=False)
     wfp.close()
diff --git a/curtin/commands/install.py b/curtin/commands/install.py
index a8c4cf9..9e5406c 100644
--- a/curtin/commands/install.py
+++ b/curtin/commands/install.py
@@ -111,12 +111,22 @@ class WorkingDir(object):
     def __init__(self, config):
         top_d = tempfile.mkdtemp()
         state_d = os.path.join(top_d, 'state')
+        scratch_d = os.path.join(top_d, 'scratch')
+        for p in (state_d, scratch_d):
+            os.mkdir(p)
+
         target_d = config.get('install', {}).get('target')
         if not target_d:
             target_d = os.path.join(top_d, 'target')
-        scratch_d = os.path.join(top_d, 'scratch')
-        for p in (state_d, target_d, scratch_d):
-            os.mkdir(p)
+        try:
+            util.ensure_dir(target_d)
+        except OSError as e:
+            raise ValueError(
+                "Unable to create target directory '%s': %s" %
+                (target_d, e))
+        if os.listdir(target_d) != []:
+            raise ValueError(
+                "Provided target dir '%s' was not empty." % target_d)
 
         netconf_f = os.path.join(state_d, 'network_config')
         netstate_f = os.path.join(state_d, 'network_state')
@@ -429,6 +439,7 @@ def cmd_install(args):
 
     writeline_and_stdout(logfile, INSTALL_START_MSG)
     args.reportstack.post_files = post_files
+    workingd = None
     try:
         workingd = WorkingDir(cfg)
         dd_images = util.get_dd_images(cfg.get('sources', {}))
@@ -469,12 +480,12 @@ def cmd_install(args):
         raise e
     finally:
         log_target_path = instcfg.get('save_install_log', SAVE_INSTALL_LOG)
-        if log_target_path:
+        if log_target_path and workingd:
             copy_install_log(logfile, workingd.target, log_target_path)
 
         if instcfg.get('unmount', "") == "disabled":
             LOG.info('Skipping unmount: config disabled target unmounting')
-        else:
+        elif workingd:
             # unmount everything (including iscsi disks)
             util.do_umount(workingd.target, recursive=True)
 
diff --git a/curtin/url_helper.py b/curtin/url_helper.py
index d4d43a9..43c5c36 100644
--- a/curtin/url_helper.py
+++ b/curtin/url_helper.py
@@ -227,7 +227,7 @@ def geturl(url, headers=None, headers_cb=None, exception_cb=None,
         try:
             return _geturl(url=url, headers=headers, headers_cb=headers_cb,
                            exception_cb=exception_cb, data=data)
-        except _ReRaisedException as e:
+        except _ReRaisedException:
             raise curexc.exc
         except Exception as e:
             curexc = e
diff --git a/curtin/util.py b/curtin/util.py
index de0eb88..7d06c09 100644
--- a/curtin/util.py
+++ b/curtin/util.py
@@ -103,10 +103,11 @@ def _subp(args, data=None, rcs=None, env=None, capture=False,
         (out, err) = sp.communicate(data)
 
         # Just ensure blank instead of none.
-        if not out and capture:
-            out = b''
-        if not err and capture:
-            err = b''
+        if capture or combine_capture:
+            if not out:
+                out = b''
+            if not err:
+                err = b''
         if decode:
             def ldecode(data, m='utf-8'):
                 if not isinstance(data, bytes):
@@ -206,6 +207,8 @@ def subp(*args, **kwargs):
         boolean indicating if stderr should be redirected to stdout. When True,
         interleaved stderr and stdout will be returned as the first element of
         a tuple.
+        if combine_capture is True, then output is captured independent of
+        the value of capture.
     :param log_captured:
         boolean indicating if output should be logged on capture.  If
         True, then stderr and stdout will be logged at DEBUG level.  If
@@ -521,6 +524,8 @@ def do_umount(mountpoint, recursive=False):
 
 
 def ensure_dir(path, mode=None):
+    if path == "":
+        path = "."
     try:
         os.makedirs(path)
     except OSError as e:
diff --git a/debian/changelog b/debian/changelog
index d7e9a49..dfd5560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+curtin (18.1-25-g9d0e557e-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream snapshot.
+    - Fix WorkingDir class to support already existing target directory.
+      (LP: #1775622)
+    - Fix extraction of local filesystem image. (LP: #1775630)
+    - Fix tip-pyflakes imported but unused call to util.get_platform_arch
+    - subp: update return value of subp with combine_capture=True.
+    - tox: add a xenial environments, default envlist changes.
+    - tests: Fix race on utcnow during timestamped curtin-log dir creation
+      (LP: #1772481)
+    - curtainer: patch source version from --source.
+    - pyflakes: fix unused variable references identified by pyflakes 2.0.0.
+
+ -- Scott Moser <[e-mail]>  Thu, 07 Jun 2018 14:59:20 -0400
+
 curtin (18.1-17-gae48e86f-0ubuntu1) cosmic; urgency=medium
 
   * New upstream snapshot.
diff --git a/tests/unittests/test_commands_collect_logs.py b/tests/unittests/test_commands_collect_logs.py
index bab36ae..6b958f4 100644
--- a/tests/unittests/test_commands_collect_logs.py
+++ b/tests/unittests/test_commands_collect_logs.py
@@ -56,11 +56,12 @@ class TestCollectLogs(CiTestCase):
         write_file(savefile, 'install:\n  log_file: /tmp/savefile.log\n')
         packdir = self.tmp_path('configs', _dir=self.new_root)
         ensure_dir(packdir)
-        date = datetime.utcnow().strftime('%Y-%m-%d-%H-%M')
         unusedcfg = os.path.join(packdir, 'config-001.yaml')
         write_file(unusedcfg, 'install:\n  log_file: /tmp/unused.log\n')
-        curtin_config = self.tmp_path(
-            'curtin-logs-%s/curtin-config' % date, _dir=self.tmpdir)
+        utcnow = datetime.utcnow()
+        datestr = utcnow.strftime('%Y-%m-%d-%H-%M')
+        tardir = self.tmp_path('curtin-logs-%s' % datestr, _dir=self.tmpdir)
+        curtin_config = self.tmp_path('curtin-config', _dir=tardir)
 
         self.assertEqual(
             '/curtin/configs', collect_logs.CURTIN_PACK_CONFIG_DIR)
@@ -72,8 +73,10 @@ class TestCollectLogs(CiTestCase):
             new=packdir, autospec=None)
         self.add_patch('shutil.rmtree', 'm_rmtree')
         with mock.patch('sys.stderr'):
-            with self.assertRaises(SystemExit) as context_manager:
-                collect_logs.collect_logs_main(FakeArgs('my.tar'))
+            with mock.patch('curtin.commands.collect_logs.datetime') as m_dt:
+                with self.assertRaises(SystemExit) as context_manager:
+                    m_dt.utcnow.return_value = utcnow
+                    collect_logs.collect_logs_main(FakeArgs('my.tar'))
         self.assertEqual('0', str(context_manager.exception))
         expected_cfg = {'install': {'log_file': '/tmp/savefile.log'}}
         with open(curtin_config, 'r') as f:
@@ -83,8 +86,9 @@ class TestCollectLogs(CiTestCase):
         """collect_logs_main sources all configs from /curtin/configs dir."""
         savefile = self.tmp_path('absentinstall.log', _dir=self.new_root)
         packdir = self.tmp_path('configs', _dir=self.new_root)
-        date = datetime.utcnow().strftime('%Y-%m-%d-%H-%M')
-        tardir = self.tmp_path('curtin-logs-%s' % date, _dir=self.tmpdir)
+        utcnow = datetime.utcnow()
+        datestr = utcnow.strftime('%Y-%m-%d-%H-%M')
+        tardir = self.tmp_path('curtin-logs-%s' % datestr, _dir=self.tmpdir)
         ensure_dir(packdir)
         cfg1 = os.path.join(packdir, 'config-001.yaml')
         cfg2 = os.path.join(packdir, 'config-002.yaml')
@@ -101,8 +105,10 @@ class TestCollectLogs(CiTestCase):
             new=packdir, autospec=None)
         self.add_patch('shutil.rmtree', 'm_rmtree')
         with mock.patch('sys.stderr'):
-            with self.assertRaises(SystemExit) as context_manager:
-                collect_logs.collect_logs_main(FakeArgs('my.tar'))
+            with mock.patch('curtin.commands.collect_logs.datetime') as m_dt:
+                with self.assertRaises(SystemExit) as context_manager:
+                    m_dt.utcnow.return_value = utcnow
+                    collect_logs.collect_logs_main(FakeArgs('my.tar'))
         self.assertEqual('0', str(context_manager.exception))
         self.assertEqual(['config-001.yaml', 'config-002.yaml'],
                          sorted(os.listdir(packdir)))
@@ -232,8 +238,8 @@ class TestCreateTar(CiTestCase):
     def setUp(self):
         super(TestCreateTar, self).setUp()
         self.new_root = self.tmp_dir()
-        date = datetime.utcnow().strftime('%Y-%m-%d-%H-%M')
-        self.tardir = 'curtin-logs-%s' % date
+        self.utcnow = datetime.utcnow()
+        self.tardir = 'curtin-logs-%s' % self.utcnow.strftime('%Y-%m-%d-%H-%M')
         self.add_patch(
             'curtin.commands.collect_logs._collect_system_info', 'm_sys_info')
         self.tmpdir = self.tmp_path('mytemp', _dir=self.new_root)
@@ -247,7 +253,9 @@ class TestCreateTar(CiTestCase):
         self.add_patch('curtin.util.subp', 'mock_subp')
         self.mock_subp.return_value = ('', '')
         with mock.patch('sys.stderr'):
-            collect_logs.create_log_tarfile(tarfile, config={})
+            with mock.patch('curtin.commands.collect_logs.datetime') as m_dt:
+                m_dt.utcnow.return_value = self.utcnow
+                collect_logs.create_log_tarfile(tarfile, config={})
         self.assertIn(
             mock.call(['tar', '-cvf', tarfile, self.tardir],
                       capture=True),
@@ -264,7 +272,9 @@ class TestCreateTar(CiTestCase):
         self.add_patch('curtin.util.subp', 'mock_subp')
         self.mock_subp.return_value = ('', '')
         with mock.patch('sys.stderr'):
-            collect_logs.create_log_tarfile(tarfile, config={})
+            with mock.patch('curtin.commands.collect_logs.datetime') as m_dt:
+                m_dt.utcnow.return_value = self.utcnow
+                collect_logs.create_log_tarfile(tarfile, config={})
         self.assertIn(
             mock.call(['tar', '-cvf', tarfile, self.tardir],
                       capture=True),
@@ -311,7 +321,9 @@ class TestCreateTar(CiTestCase):
                 'maas': {'consumer_key': 'ckey',
                          'token_key': 'tkey', 'token_secret': 'tsecret'}}}
         with mock.patch('sys.stderr'):
-            collect_logs.create_log_tarfile(tarfile, config=config)
+            with mock.patch('curtin.commands.collect_logs.datetime') as m_dt:
+                m_dt.utcnow.return_value = self.utcnow
+                collect_logs.create_log_tarfile(tarfile, config=config)
         self.assertEqual(
             [mock.call(self.tardir, ['ckey', 'tkey', 'tsecret'])],
             self.m_redact.call_args_list)
diff --git a/tests/unittests/test_commands_extract.py b/tests/unittests/test_commands_extract.py
new file mode 100644
index 0000000..e604d7f
--- /dev/null
+++ b/tests/unittests/test_commands_extract.py
@@ -0,0 +1,72 @@
+# This file is part of curtin. See LICENSE file for copyright and license info.
+import os
+
+from .helpers import CiTestCase
+
+from curtin import util
+from curtin.commands.extract import extract_root_fsimage_url
+
+
+class TestExtractRootFsImageUrl(CiTestCase):
+    """Test extract_root_fsimage_url."""
+    def _fake_download(self, url, path):
+        self.downloads.append(os.path.abspath(path))
+        with open(path, "w") as fp:
+            fp.write("fake content from " + url + "\n")
+
+    def setUp(self):
+        super(TestExtractRootFsImageUrl, self).setUp()
+        self.downloads = []
+        self.add_patch("curtin.commands.extract.url_helper.download",
+                       "m_download", side_effect=self._fake_download)
+        self.add_patch("curtin.commands.extract._extract_root_fsimage",
+                       "m__extract_root_fsimage")
+
+    def test_relative_file_url(self):
+        """extract_root_fsimage_url supports relative file:// urls."""
+        tmpd = self.tmp_dir()
+        target = self.tmp_path("target_d", tmpd)
+        startdir = os.getcwd()
+        try:
+            fname = "my.img"
+            util.write_file(fname, fname + " data\n")
+            extract_root_fsimage_url("file://" + fname, target)
+        finally:
+            os.chdir(startdir)
+        self.assertEqual(1, self.m__extract_root_fsimage.call_count)
+        self.assertEqual(0, self.m_download.call_count)
+
+    def test_absolute_file_url(self):
+        """extract_root_fsimage_url supports absolute file:/// urls."""
+        tmpd = self.tmp_dir()
+        target = self.tmp_path("target_d", tmpd)
+        fpath = self.tmp_path("my.img", tmpd)
+        util.write_file(fpath, fpath + " data\n")
+        extract_root_fsimage_url("file://" + fpath, target)
+        self.assertEqual(1, self.m__extract_root_fsimage.call_count)
+        self.assertEqual(0, self.m_download.call_count)
+
+    def test_http_url(self):
+        """extract_root_fsimage_url supports http:// urls."""
+        tmpd = self.tmp_dir()
+        target = self.tmp_path("target_d", tmpd)
+        myurl = "http://bogus.example.com/my.img"
+        extract_root_fsimage_url(myurl, target)
+        self.assertEqual(1, self.m__extract_root_fsimage.call_count)
+        self.assertEqual(1, self.m_download.call_count)
+        # ensure the file got cleaned up.
+        self.assertEqual(1, len(self.downloads))
+        self.assertEqual([], [f for f in self.downloads if os.path.exists(f)])
+
+    def test_file_path_not_url(self):
+        """extract_root_fsimage_url supports normal file path without file:."""
+        tmpd = self.tmp_dir()
+        target = self.tmp_path("target_d", tmpd)
+        fpath = self.tmp_path("my.img", tmpd)
+        util.write_file(fpath, fpath + " data\n")
+        extract_root_fsimage_url(os.path.abspath(fpath), target)
+        self.assertEqual(1, self.m__extract_root_fsimage.call_count)
+        self.assertEqual(0, self.m_download.call_count)
+
+
+# vi: ts=4 expandtab syntax=python
diff --git a/tests/unittests/test_commands_install.py b/tests/unittests/test_commands_install.py
index 47f4497..9a64a79 100644
--- a/tests/unittests/test_commands_install.py
+++ b/tests/unittests/test_commands_install.py
@@ -189,3 +189,43 @@ class TestCmdInstall(CiTestCase):
         self.assertEqual(
             [mock.call(self.logfile, target_dir, '/root/curtin-install.log')],
             self.m_copy_log.call_args_list)
+
+
+class TestWorkingDir(CiTestCase):
+    def test_target_dir_may_exist(self):
+        """WorkingDir supports existing empty target directory."""
+        tmp_d = self.tmp_dir()
+        work_d = self.tmp_path("work_d", tmp_d)
+        target_d = self.tmp_path("target_d", tmp_d)
+        ensure_dir(work_d)
+        ensure_dir(target_d)
+        with mock.patch("curtin.commands.install.tempfile.mkdtemp",
+                        return_value=work_d) as m_mkdtemp:
+            workingdir = install.WorkingDir({'install': {'target': target_d}})
+        self.assertEqual(1, m_mkdtemp.call_count)
+        self.assertEqual(target_d, workingdir.target)
+        self.assertEqual(target_d, workingdir.env().get('TARGET_MOUNT_POINT'))
+
+    def test_target_dir_with_content_raises_error(self):
+        """WorkingDir raises ValueError on populated target_d."""
+        tmp_d = self.tmp_dir()
+        work_d = self.tmp_path("work_d", tmp_d)
+        target_d = self.tmp_path("target_d", tmp_d)
+        ensure_dir(work_d)
+        ensure_dir(target_d)
+        write_file(self.tmp_path("somefile.txt", target_d), "sometext")
+        with mock.patch("curtin.commands.install.tempfile.mkdtemp",
+                        return_value=work_d):
+            with self.assertRaises(ValueError):
+                install.WorkingDir({'install': {'target': target_d}})
+
+    def test_target_dir_by_default_is_under_workd(self):
+        """WorkingDir does not require target in config."""
+        tmp_d = self.tmp_dir()
+        work_d = self.tmp_path("work_d", tmp_d)
+        ensure_dir(work_d)
+        with mock.patch("curtin.commands.install.tempfile.mkdtemp",
+                        return_value=work_d) as m_mkdtemp:
+            wd = install.WorkingDir({})
+        self.assertEqual(1, m_mkdtemp.call_count)
+        self.assertTrue(wd.target.startswith(work_d + "/"))
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index 65175c5..483cd5d 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -260,7 +260,7 @@ class TestSubp(CiTestCase):
         data = b'hello world'
         (out, err) = util.subp(self.stdin2err, combine_capture=True,
                                decode=False, data=data)
-        self.assertIsNone(err)
+        self.assertEqual(err, b'')
         self.assertEqual(out, data)
 
     def test_returns_none_if_no_capture(self):
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 5c30a83..0c3d17e 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -1091,7 +1091,7 @@ class VMBaseClass(TestCase):
         # mount output disk
         try:
             cls.collect_output()
-        except Exception as e:
+        except Exception:
             cls.tearDownClass()
             raise
 
diff --git a/tests/vmtests/image_sync.py b/tests/vmtests/image_sync.py
index bbe523a..e2cedc1 100644
--- a/tests/vmtests/image_sync.py
+++ b/tests/vmtests/image_sync.py
@@ -174,7 +174,7 @@ class CurtinVmTestMirror(mirrors.ObjectFilterMirror):
             except IOError as e:
                 if e.errno != errno.ENOENT:
                     raise
-            except JSONDecodeError as e:
+            except JSONDecodeError:
                 jsonfile = os.path.join(self.out_d, dpath)
                 sys.stderr.write("Decode error in:\n  "
                                  "content_id=%s\n  "
diff --git a/tools/curtainer b/tools/curtainer
index ca698c6..466d719 100755
--- a/tools/curtainer
+++ b/tools/curtainer
@@ -17,10 +17,13 @@ Usage: ${0##*/} [ options ] <image> name
    start a container of image (ubuntu-daily:xenial) and install curtin.
 
    options:
-      --proposed    enable proposed
-      --daily       enable daily curtin archive
-      --source   D  grab the source deb, unpack inside, and copy unpacked
-                    source out to 'D'
+      --no-patch-version  do not patch source dir/curtin/version.py
+                          by default, --source will have version.py updated
+                          with dpkg's version.
+      --proposed          enable proposed
+      --daily             enable daily curtin archive
+      --source   D        grab the source deb, unpack inside, and copy unpacked
+                          source out to 'D'
 EOF
 }
 
@@ -114,7 +117,7 @@ get_source() {
 
 main() {
     local short_opts="hv"
-    local long_opts="help,daily,proposed,source:,verbose"
+    local long_opts="help,daily,no-patch-version,proposed,source:,verbose"
     local getopt_out=""
     getopt_out=$(getopt --name "${0##*/}" \
         --options "${short_opts}" --long "${long_opts}" -- "$@") &&
@@ -123,13 +126,14 @@ main() {
 
     local cur="" next=""
     local proposed=false daily=false src="" name="" maxwait=30
-    local eatmydata="eatmydata" getsource="none"
+    local eatmydata="eatmydata" getsource="none" patch_version=true
 
     while [ $# -ne 0 ]; do
         cur="$1"; next="$2";
         case "$cur" in
             -h|--help) Usage ; exit 0;;
                --source) getsource="$next"; shift;;
+               --no-patch-version) patch_version=false;;
                --proposed) proposed=true;;
                --daily) daily=true;;
             -v|--verbose) VERBOSITY=$((${VERBOSITY}+1));;
@@ -147,6 +151,7 @@ main() {
     if [ "$getsource" != "none" ]; then
         [ ! -e "$getsource" ] || fail "source output '$getsource' exists."
     fi
+    getsource="${getsource%/}"
 
     lxc launch "$src" "$name" || fail "failed lxc launch $src $name"
     CONTAINER=$name
@@ -218,6 +223,16 @@ main() {
         if [ "$src_ver" != "$pkg_ver" ]; then
             fail "source version ($src_ver) != package version ($pkg_ver)"
         fi
+        if "${patch_version}"; then
+            local verfile="$getsource/curtin/version.py"
+            grep -q "@@PACKAGED_VERSION@@" "$verfile" ||
+                fail "failed patching version: " \
+                    "@@PACKAGED_VERSION@@ not found in $verfile"
+            sed -i.curtainer-dist \
+                "s,@@PACKAGED_VERSION@@,${pkg_ver}," "$verfile" ||
+                fail "failed modifying $verfile"
+            debug 1 "patched $verfile pkg version to $pkg_ver."
+        fi
         inside "$name" rm -Rf "$isrcd" ||
             fail "failed removal of extract dir"
         debug 1 "put source for curtin at $src_ver in $getsource"
diff --git a/tools/vmtest-sync-images b/tools/vmtest-sync-images
index 3d82b62..762702b 100755
--- a/tools/vmtest-sync-images
+++ b/tools/vmtest-sync-images
@@ -18,7 +18,6 @@ from tests.vmtests import (
     IMAGE_DIR, IMAGE_SRC_URL, sync_images)
 from tests.vmtests.image_sync import ITEM_NAME_FILTERS
 from tests.vmtests.helpers import (find_arches, find_releases_by_distro)
-from curtin.util import get_platform_arch
 
 
 def _fmt_list_filter(filter_name, matches):
diff --git a/tox.ini b/tox.ini
index c1748c3..6f14381 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,14 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py27, py3, py3-flake8, py3-pylint, py27-pylint, trusty-check, trusty-py27, trusty-py3
+envlist =
+   py3-flake8,
+   py27,
+   py3,
+   py3-pylint,
+   py27-pylint,
+   trusty-py27,
+   xenial-py3
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
@@ -91,6 +98,25 @@ basepython = python3
 commands = {envpython} {toxinidir}/tools/noproxy nosetests \
     {posargs:tests/unittests}
 
+[testenv:xenial]
+deps =
+   mock==1.3.0
+   nose==1.3.7
+   pyyaml==3.11
+   oauthlib==1.0.3
+
+[testenv:xenial-py27]
+basepython = python27
+deps = {[testenv:xenial]deps}
+commands = {envpython} {toxinidir}/tools/noproxy nosetests \
+    {posargs:tests/unittests}
+
+[testenv:xenial-py3]
+basepython = python3
+deps = {[testenv:xenial]deps}
+commands = {envpython} {toxinidir}/tools/noproxy nosetests \
+    {posargs:tests/unittests}
+
 [testenv:tip-pycodestyle]
 commands = {envpython} -m pycodestyle {posargs:curtin/ tests/ tools/}
 deps = pycodestyle