TEST: various fixes for testing in the CI

Author: pohly

meta-refkit-core/lib/oeqa/selftest/cases/refkit_ostree.py

@@ -14,9 +14,11 @@ class RefkitOSTreeUpdateBase(HTTPUpdate):
     IMAGE_BBAPPEND = IMAGE_PN + '.bbappend'
     IMAGE_BBAPPEND_UPDATE = IMAGE_BBAPPEND
 
-    # We cannot get the actual OSTREE_REPO for the
-    # image here, so we just assume that it is in the usual place.
-    REPO_DIR = os.path.join(HTTPUpdate.BB_VARS['DEPLOY_DIR'], 'ostree-repo')
+    def setUp(self):
+        # We cannot get the actual OSTREE_REPO for the
+        # image here, so we just assume that it is in the usual place.
+        self.REPO_DIR = os.path.join(HTTPUpdate.BB_VARS['DEPLOY_DIR'], 'ostree-repo')
+        super().setUp()
 
     def stop_update_service(self, qemu):
         cmd = '''systemctl stop refkit-update.service'''

meta-refkit-core/lib/oeqa/selftest/cases/refkit_swupd.py

@@ -18,8 +18,10 @@ class RefkitSwupdUpdateBase(HTTPUpdate):
     IMAGE_BBAPPEND = IMAGE_PN + '.bbappend'
     IMAGE_BBAPPEND_UPDATE = IMAGE_BBAPPEND
 
-    SWUPD_DIR = os.path.join(HTTPUpdate.BB_VARS['DEPLOY_DIR'], 'swupd', HTTPUpdate.BB_VARS['MACHINE'], IMAGE_PN)
-    REPO_DIR = os.path.join(SWUPD_DIR, 'www')
+    def setUp(self):
+        self.SWUPD_DIR = os.path.join(HTTPUpdate.BB_VARS['DEPLOY_DIR'], 'swupd', HTTPUpdate.BB_VARS['MACHINE'], self.IMAGE_PN)
+        self.REPO_DIR = os.path.join(self.SWUPD_DIR, 'www')
+        super().setUp()
 
     IMAGE_MODIFY = copy.copy(HTTPUpdate.IMAGE_MODIFY)
 
@@ -138,13 +140,15 @@ def update_image_via_http(self, qemu):
 
     def update_image(self, qemu):
         # Dump some information about changes in version 20.
-        print('Changes in 20/Manifest.full:')
+        lines = []
+        lines.append('Changes in 20/Manifest.full:\n')
         entry_re = re.compile('^(?P<type>\S+)\s+(?P<hash>[0-9a-f]+)\s+(?P<version>\d+)\s+(?P<path>.*)$')
         with open(os.path.join(self.REPO_DIR, '20', 'Manifest.full')) as f:
             for line in f:
                 m = entry_re.match(line)
                 if m and m.group('version') == '20':
-                    print(line, end='')
+                    lines.append(line)
+        self.logger.info(''.join(lines))
         super().update_image(qemu)
 
 class RefkitSwupdUpdateTestAll(RefkitSwupdUpdateBase):
@@ -171,9 +175,8 @@ def test_update_all(self):
                     if any(map(lambda x: x in line, hashes)):
                         file_names.append(line)
             self.fail('should have %d files, got %d:\n%s\n\nManifest.full:\n%s' % (expected, len(files), '\n'.join(files), ' '.join(file_names)))
-        # In two cases, a delta made sense.
         deltas = [x for x in repo_items if x.startswith('20/delta/')]
-        self.assertEqual(len(deltas), 2, msg='should have 1 delta, got: %s' % deltas)
+        self.assertEqual(len(deltas), 1, msg='should have 1 delta for modify_files_large, got: %s' % deltas)
 
 class RefkitSwupdUpdateTestIncremental(RefkitSwupdUpdateBase):
 
@@ -201,6 +204,7 @@ def modify_image_build(self, testname, updates, is_update):
     def setUp(self):
         self.wwwdir = os.path.abspath('test-swupd-www')
         # self.track_for_cleanup(self.wwwdir)
+        super().setUp()
 
     def test_update_incremental(self):
         """
@@ -256,6 +260,8 @@ def modify_image_build(self, testname, updates, is_update):
         bbappend.append('REFKIT_EXTRA_PARTITION = "part ${REFKIT_IMAGE_SIZE} --fstype=ext4 --label inactive --align 1024 --uuid %s"' % self.PARTUUID)
         # Needed for installing from scratch.
         bbappend.append('SWUPD_GENERATE_OS_CORE_ZERO_PACK = "true"')
+        # Needed for formatting the partition.
+        bbappend.append('REFKIT_IMAGE_EXTRA_INSTALL_append = " e2fsprogs"')
         return '\n'.join(bbappend)
 
     def normalize_partition_output(self, output, zero_missing=False):
@@ -287,10 +293,10 @@ def update_partition(self, qemu, cmd, expected, version, **kwargs):
         Run a single swupd-update-partition command and check the result, including the HTTP log.
         """
         self.http_log.clear()
-        print(cmd)
+        self.logger.info(cmd)
         status, output = qemu.run_serial(cmd, timeout=600)
         self.assertEqual(1, status, 'Failed to run command "%s":\n%s' % (cmd, output))
-        print(output)
+        self.logger.info(output)
         output = self.normalize_partition_output(output, **kwargs)
         # Normalize the HTTP log by replacing /10/files/57de850a026aee38bb06a2a8d6c014a773c2dc3268032b44c0b5b3e7e4ec53f2.tar
         # with

meta-refkit-core/lib/oeqa/selftest/systemupdate/httpupdate.py

@@ -23,14 +23,25 @@ class HTTPUpdate(SystemUpdateBase):
 
     # Global variables are the same for all recipes,
     # but RECIPE_SYSROOT_NATIVE is specific to socat-native.
-    BB_VARS = get_bb_vars([
-        'DEPLOY_DIR',
-        'MACHINE',
-        'RECIPE_SYSROOT_NATIVE',
-        ],
-                          'socat-native')
-
-    # To be set by derived class.
+    # We store that in the class because then it can be shared by
+    # multiple derived instances.
+    class DelayedGetVars:
+        def __init__(self):
+            self._cache = None
+
+        def __getitem__(self, key):
+            if self._cache is None:
+                self._cache = get_bb_vars([
+                    'DEPLOY_DIR',
+                    'MACHINE',
+                    'RECIPE_SYSROOT_NATIVE',
+                    ],
+                    'socat-native')
+            return self._cache[key]
+
+    BB_VARS = DelayedGetVars()
+
+    # To be set by derived class or instance.
     REPO_DIR = None
 
     def track_for_cleanup(self, name):

meta-refkit-core/lib/oeqa/selftest/systemupdate/systemupdatebase.py

@@ -43,6 +43,9 @@ class SystemUpdateModify(object):
         ( 'udev/udev.conf', None ),
     ]
 
+    LARGE_FILE_CONTENT = '!"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_abcdefghijklmnopqrstuvwxyz{|}~'
+    LARGE_FILE_CONTENT_APPEND = 'hello'
+
     def modify_kernel(self, testname, is_update, rootfs):
         """
         Patch the kernel in an existing rootfs. Called during rootfs construction,
@@ -66,14 +69,29 @@ def modify_files(self, testname, is_update, rootfs):
         """
         Simulate simple adding, removing and modifying of files under /usr/bin.
         """
-        testdir = os.path.join(rootfs, 'usr', 'bin')
+        testdir = pathlib.Path(rootfs) / 'usr' / 'bin'
+        remove_me = testdir / 'modify_files_remove_me'
+        update_me = testdir / 'modify_files_update_me'
+        was_added = testdir / 'modify_files_was_added'
+        large = testdir / 'modify_files_large'
+
+        # Add/remove file cases.
         if not is_update:
-            pathlib.Path(os.path.join(testdir, 'modify_files_remove_me')).touch()
-            pathlib.Path(os.path.join(testdir, 'modify_files_update_me')).touch()
+            remove_me.touch()
         else:
-            with open(os.path.join(testdir, 'modify_files_update_me'), 'w') as f:
+            was_added.touch()
+
+        # This is case where the full new file is smaller than a delta.
+        with update_me.open('w') as f:
+            if is_update:
                 f.write('updated\n')
-            pathlib.Path(os.path.join(testdir, 'modify_files_was_added')).touch()
+
+        # Whereas for a large file, a binary delta is more efficient.
+        with large.open('w') as f:
+            f.write(self.LARGE_FILE_CONTENT)
+            if is_update:
+                f.write(self.LARGE_FILE_CONTENT_APPEND)
+            f.write('\n')
 
     def verify_files(self, testname, is_update, qemu, test):
         """
@@ -83,14 +101,22 @@ def verify_files(self, testname, is_update, qemu, test):
         status, output = qemu.run_serial(cmd)
         test.assertEqual(1, status, 'Failed to run command "%s":\n%s' % (cmd, output))
         if not is_update:
-            test.assertEqual(output, '/usr/bin/modify_files_remove_me\r\n/usr/bin/modify_files_update_me')
+            test.assertEqual(output, '/usr/bin/modify_files_large\r\n/usr/bin/modify_files_remove_me\r\n/usr/bin/modify_files_update_me')
         else:
-            test.assertEqual(output, '/usr/bin/modify_files_update_me\r\n/usr/bin/modify_files_was_added')
+            test.assertEqual(output, '/usr/bin/modify_files_large\r\n/usr/bin/modify_files_update_me\r\n/usr/bin/modify_files_was_added')
             cmd = 'cat /usr/bin/modify_files_update_me'
             status, output = qemu.run_serial(cmd)
             test.assertEqual(1, status, 'Failed to run command "%s":\n%s' % (cmd, output))
             test.assertEqual(output, 'updated')
 
+        cmd = 'cat /usr/bin/modify_files_large'
+        status, output = qemu.run_serial(cmd)
+        test.assertEqual(1, status, 'Failed to run command "%s":\n%s' % (cmd, output))
+        expected = self.LARGE_FILE_CONTENT
+        if is_update:
+            expected += self.LARGE_FILE_CONTENT_APPEND
+        test.assertEqual(expected, output)
+
     def modify_etc(self, testname, is_update, rootfs):
         """
         If there are files in /etc, then it should be possible to update

meta-refkit-core/recipes-selftest/images/refkit-image-update-swupd.bb

@@ -11,3 +11,7 @@ REFKIT_IMAGE_EXTRA_FEATURES += "connectivity"
 # Speed up testing by disabling the os-core zero pack.
 # It is only needed for "swupd verify --install".
 SWUPD_GENERATE_OS_CORE_ZERO_PACK = "false"
+
+# BUILD_ID is fixed in the CI system and variable in local builds (=
+# ${DATETIME}). To ensure consistent test results, we keep it fixed here.
+BUILD_ID = "swupd-test-build"