Merge lp:~barry/ubuntu-system-image/lp1558190 into lp:ubuntu-system-image/server

[Barry Warsaw]

Fixes LP: #1558190 and repairs the test suite.

This fixes LP: #1558190 by adding mtime attributes to the tarball files config.d and the enclosed .ini symlinks.

This branch also repairs the test suite and adds Python 3.5 support so that tox will work on Xenial.

[Łukasz Zemczak (sil2100)]

Looks good! I personally prefer adding test descriptions in """ """ for each test case, but that's just my style preference. I suppose checking if the date is higher than the epoch is good enough, but we could think of doing some closer checks to like fetching the local time now and looking if the generated tarball has a higher-or-equal one, to check for any future bugs that might make s-i writing some strange timestamps buuut... that's not really a probable case (can't think of a way that could happen). So a big +1 from me.

review: Approve

=== added file 'coverage-py35.ini'
--- coverage-py35.ini	1970-01-01 00:00:00 +0000
+++ coverage-py35.ini	2016-03-16 19:03:31 +0000
@@ -0,0 +1,7 @@
+[run]
+branch = true
+parallel = true
+omit =
+     lib/systemimage/testing/*
+     lib/systemimage/tests/*
+     /usr/lib/*
 
=== modified file 'lib/systemimage/tests/test_generators.py'
--- lib/systemimage/tests/test_generators.py	2015-11-12 14:46:48 +0000
+++ lib/systemimage/tests/test_generators.py	2016-03-16 19:03:31 +0000
@@ -989,7 +989,8 @@
                 fd.write(url)
         mock_urlretrieve.side_effect = urlretrieve_side_effect
 
-        def repack_recovery_keyring_effect(conf, path, keyring):
+        def repack_recovery_keyring_effect(conf, path, keyring,
+                                           device_name=None):
             if keyring == "fail":
                 return False
 
 
=== modified file 'lib/systemimage/tests/test_static.py'
--- lib/systemimage/tests/test_static.py	2015-09-29 14:16:48 +0000
+++ lib/systemimage/tests/test_static.py	2016-03-16 19:03:31 +0000
@@ -101,7 +101,7 @@
         output = subp.communicate()[0].splitlines()
         for line in output:
             print(line)
-        self.assertEqual(0, len(output))
+        self.assertEqual(0, len(output), output)
 
     @unittest.skipIf(pyflakes is None, "Missing pyflakes, skipping test.")
     def test_pyflakes_clean(self):
 
=== modified file 'lib/systemimage/tests/test_tools.py'
--- lib/systemimage/tests/test_tools.py	2016-02-17 09:23:22 +0000
+++ lib/systemimage/tests/test_tools.py	2016-03-16 19:03:31 +0000
@@ -24,6 +24,8 @@
 import unittest
 import six
 
+from datetime import datetime
+from glob import glob
 from systemimage import config, tools, tree, gpg
 from systemimage.helpers import chdir
 from systemimage.testing.helpers import HAS_TEST_KEYS, MISSING_KEYS_WARNING
@@ -259,7 +261,7 @@
         source_path = os.path.join(self.temp_directory, "source")
         stripped_path = os.path.join(self.temp_directory, "stripped")
         reattached_path = os.path.join(self.temp_directory, "reattached")
-        
+
         header = bytearray(512)
         contents = b"RECOVERY"
         for i in range(0, 64):
@@ -278,7 +280,6 @@
         with open(reattached_path, "rb") as f, open(source_path, "rb") as fs:
             self.assertEqual(f.read(), fs.read())
 
-
     @unittest.skipUnless(HAS_TEST_KEYS, MISSING_KEYS_WARNING)
     def test_repack_recovery_keyring(self):
         # Generate the keyring tarballs
@@ -371,7 +372,6 @@
                                                    self.temp_directory,
                                       "archive-master", "krillin")
 
-
     def test_system_image_30_symlinks(self):
         # To support system-image 3.0, generate symlinks for config.d
         version_tarball = "%s/version.tar" % self.temp_directory
@@ -398,16 +398,38 @@
         # Extract the tarfile to another temp directory, so that we can
         # exactly compare extracted directory modes.
         extract_dir = tempfile.mkdtemp()
-        try:
-            safe_extract(version_tarball, extract_dir)
-            config_d = os.path.join(
-                extract_dir, "system", "etc", "system-image", "config.d")
-            mode = stat.S_IMODE(os.stat(config_d).st_mode)
-        finally:
-            shutil.rmtree(extract_dir)
+        self.addCleanup(shutil.rmtree, extract_dir)
+        safe_extract(version_tarball, extract_dir)
+        config_d = os.path.join(
+            extract_dir, "system", "etc", "system-image", "config.d")
+        mode = stat.S_IMODE(os.stat(config_d).st_mode)
         self.assertEqual(mode, 0o775,
                          'got 0o{:o}, expected 0o775'.format(mode))
 
+    def test_system_image_30_mtimes(self):
+        # The etc/system-image/config.d directory and the 00_default.ini,
+        # 01_channel.ini symlinks should have proper mtimes.  LP: #1558190
+        version_tarball = "%s/version.tar" % self.temp_directory
+        tools.generate_version_tarball(self.config, "testing", "test",
+                                       "1.2.3.4",
+                                       version_tarball)
+        # Extract the tarfile to another temp directory, so that we can
+        # exactly check mtimes.
+        extract_dir = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, extract_dir)
+        safe_extract(version_tarball, extract_dir)
+        config_d = os.path.join(
+            extract_dir, "system", "etc", "system-image", "config.d")
+        epoch = datetime(1970, 1, 1)
+        self.assertGreater(datetime.fromtimestamp(os.stat(config_d).st_mtime),
+                           epoch)
+        ini_files = glob(os.path.join(config_d, '*.ini'))
+        # Future-proof: at least two ini files.
+        self.assertGreaterEqual(len(ini_files), 2)
+        for ini_file in ini_files:
+            mtime = os.lstat(ini_file).st_mtime
+            self.assertGreater(datetime.fromtimestamp(mtime), epoch)
+
     def test_set_tag_on_version_detail(self):
         """Set a basic tag."""
         version_detail_list = [
 
=== modified file 'lib/systemimage/tools.py'
--- lib/systemimage/tools.py	2016-02-17 09:23:22 +0000
+++ lib/systemimage/tools.py	2016-03-16 19:03:31 +0000
@@ -32,7 +32,7 @@
 from systemimage import gpg
 
 
-READ_SIZE = 1024*1024
+READ_SIZE = 1024 * 1024
 
 logger = logging.getLogger(__name__)
 
@@ -86,10 +86,11 @@
     """
 
     tarball = tarfile.open(path, 'w:')
+    now_mtime = int(time.time())
 
     version_file = tarfile.TarInfo()
     version_file.size = len(version) + 1
-    version_file.mtime = int(time.strftime("%s", time.localtime()))
+    version_file.mtime = now_mtime
     version_file.name = build_path
 
     # Append a line break
@@ -124,7 +125,7 @@
 
     channel_file = tarfile.TarInfo()
     channel_file.size = len(channel)
-    channel_file.mtime = int(time.strftime("%s", time.localtime()))
+    channel_file.mtime = now_mtime
     channel_file.name = channel_path
 
     tarball.addfile(channel_file, BytesIO(channel.encode("utf-8")))
@@ -142,6 +143,7 @@
     directory = tarfile.TarInfo(config_d)
     directory.type = tarfile.DIRTYPE
     directory.mode = 0o775
+    directory.mtime = now_mtime
     tarball.addfile(directory)
 
     path_00_default = os.path.join(config_d, "00_default.ini")
@@ -149,6 +151,7 @@
     default_file.name = path_00_default
     default_file.type = tarfile.SYMTYPE
     default_file.linkname = "../client.ini"
+    default_file.mtime = now_mtime
     tarball.addfile(default_file)
 
     path_01_channel = os.path.join(config_d, "01_channel.ini")
@@ -157,6 +160,7 @@
     channel_file.type = tarfile.SYMTYPE
     channel_file.linkname = os.path.join(
         "..", os.path.basename(channel_path))
+    channel_file.mtime = now_mtime
     tarball.addfile(channel_file)
 
     tarball.close()
@@ -194,7 +198,7 @@
     compressions = {
         b"\x1f\x8b\x08": "gzip",
         b"\xfd\x37\x7a\x58\x5a\x00": "xz"
-    }
+        }
     length = max(len(x) for x in compressions)
 
     with open(path, 'rb') as f:
 
=== modified file 'tox.ini'
--- tox.ini	2015-10-20 21:51:48 +0000
+++ tox.ini	2016-03-16 19:03:31 +0000
@@ -1,6 +1,7 @@
 [tox]
-envlist = py27,py34,coverage-py27,coverage-py34,fast-{py27,py34}
+envlist = py27,py34,py35,coverage-py27,coverage-py34,coverage-py35,fast-{py27,py34,py35}
 recreate = True
+skip_missing_interpreters = True
 
 [coverage]
 rcfile = {toxinidir}/{envname}.ini
@@ -37,3 +38,11 @@
     python3-coverage html {[coverage]rc} {[coverage]dir}
 sitepackages = True
 usedevelop = True
+
+[testenv:coverage-py35]
+commands =
+    python /usr/bin/python3-coverage run {[coverage]rc} -m nose2 -v
+    python3-coverage combine {[coverage]rc}
+    python3-coverage html {[coverage]rc} {[coverage]dir}
+sitepackages = True
+usedevelop = True