refkit_swupd.py: test script return code

We need to check the exact return code now. Also ensure that we always
remove the .swupd-contenturl file, even after a failure.

In addition, we simulate network issues. Only one of the two test
cases are currently handled as expected by swupd.

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

Author: pohly

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

@@ -301,19 +301,20 @@ def normalize_partition_output(self, output, unknown_missing=False):
         # Number of files may vary.
         output, _ = re.subn(r'Inspected \d+ files', 'Inspected xxx files', output)
         # Timing varies.
-        output, _ = re.subn(r'Update took \d.\d seconds', 'Update took x.y seconds', output)
+        output, _ = re.subn(r'Update took \d+.\d seconds', 'Update took x.y seconds', output)
         # Re-installing from scratch means we don't know how many files actually miss (depends on OS).
         if unknown_missing:
             output, _ = re.subn(r'\d+ files were missing', 'xxx files were missing', output)
             output, _ = re.subn(r'\d+ of \d+ missing files were replaced', 'xxx of xxx missing files were replaced', output)
             output, _ = re.subn(r'0 of \d+ missing files were not replaced', '0 of xxx missing files were not replaced', output)
         return output
 
-    def update_partition(self, qemu, cmd, expected, version, **kwargs):
+    def update_partition(self, qemu, cmd, expected, version, network_error=None, **kwargs):
         """
         Run a single swupd-update-partition command and check the result, including the HTTP log.
         """
         self.http_log.clear()
+        self.stop_serving_http_at = network_error
         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))
@@ -654,7 +655,7 @@ def update_image_via_http(qemu):
             # Update, with source, with formatting.  For this we need to
             # set the content URL in the source partition for this and
             # remove it when done.
-            cmd = 'echo "{0}"  >/.swupd-contenturl && swupd-update-partition -c {0} -p /dev/disk/by-partuuid/{1} -m 20 -f "mkfs.ext4 -F /dev/disk/by-partuuid/{1}" -F -s / && rm /.swupd-contenturl'.format(url, self.PARTUUID)
+            cmd = 'echo "{0}"  >/.swupd-contenturl && swupd-update-partition -c {0} -p /dev/disk/by-partuuid/{1} -m 20 -f "mkfs.ext4 -F /dev/disk/by-partuuid/{1}" -F -s /; ret=$?; /.swupd-contenturl; [ $ret -eq 0 ]'.format(url, self.PARTUUID)
             # Some /etc files get modified at runtime due to the writable
             # rootfs and thus do not match.
             expected = '''swupd-update-partition: Bind-mounting source tree.
@@ -764,7 +765,7 @@ def update_image_via_http(qemu):
 
             # Update, with source, with formatting, but wrong content URL
             # and thus using file fixing instead of the delta pack.
-            cmd = 'echo "http://example.org"  >/.swupd-contenturl && swupd-update-partition -c {0} -p /dev/disk/by-partuuid/{1} -m 20 -f "mkfs.ext4 -F /dev/disk/by-partuuid/{1}" -F -s / && rm /.swupd-contenturl'.format(url, self.PARTUUID)
+            cmd = 'echo "http://example.org"  >/.swupd-contenturl && swupd-update-partition -c {0} -p /dev/disk/by-partuuid/{1} -m 20 -f "mkfs.ext4 -F /dev/disk/by-partuuid/{1}" -F -s /; ret=$?; rm /.swupd-contenturl; [ $ret -eq 0 ]'.format(url, self.PARTUUID)
             # Some /etc files get modified at runtime due to the writable
             # rootfs and thus do not match.
             expected = '''swupd-update-partition: Bind-mounting source tree.
@@ -865,3 +866,113 @@ def update_image_via_http(qemu):
 
         setattr(self, 'update_image_via_http', update_image_via_http)
         self.do_update('test_update_partition', self.IMAGE_MODIFY.UPDATES, have_zero_packs=True)
+
+    def test_update_same_url_network_0(self):
+        """
+        Same as test_update_same_url, but with network errors before first HTTP request.
+        """
+
+        def update_image_via_http(qemu):
+            self.maxDiff = None
+            url = 'http://%s' % self.HTTPD_SERVER
+
+            # Update, with source, with formatting.  For this we need to
+            # set the content URL in the source partition for this and
+            # remove it when done.
+            cmd = 'echo "{0}"  >/.swupd-contenturl && swupd-update-partition -c {0} -p /dev/disk/by-partuuid/{1} -m 20 -f "mkfs.ext4 -F /dev/disk/by-partuuid/{1}" -F -s /; ret=$?; rm /.swupd-contenturl; [ $ret -eq 2 ]'.format(url, self.PARTUUID)
+            # Some /etc files get modified at runtime due to the writable
+            # rootfs and thus do not match.
+            expected = '''swupd-update-partition: Bind-mounting source tree.
+swupd-update-partition: mount -obind,ro / /tmp/swupd-mount-source.X
+swupd-update-partition: Updating to 20 from {url}.
+swupd-update-partition: Reinstalling from scratch.
+swupd-update-partition: Formatting partition.
+swupd-update-partition: mkfs.ext4 -F /dev/disk/by-partuuid/87654321-9abc-def0-0fed-cba987654320
+...
+swupd-update-partition: mount /dev/disk/by-partuuid/{uuid} /tmp/swupd-mount.X
+swupd-update-partition: Copy from source /.
+swupd-update-partition: Content URL unchanged, trying to update.
+swupd-update-partition: swupd update -c {url} -v file:///tmp/swupd-version.X -S /tmp/swupd-mount.X/swupd-state -p /tmp/swupd-mount.X
+swupd-client software ...
+
+Attempting to download version string to memory
+Update started.
+Preparing to update from 10 to 20
+Failed to retrieve 10 MoM manifest
+Retry #1 downloading from/to MoM Manifests
+Failed to retrieve 10 MoM manifest
+Retry #2 downloading from/to MoM Manifests
+Failed to retrieve 10 MoM manifest
+Retry #3 downloading from/to MoM Manifests
+Failed to retrieve 10 MoM manifest
+Failure retrieving manifest from server
+Update took x.y seconds
+swupd-update-partition: swupd: EMOM_NOTFOUND = 4 = MoM cannot be loaded into memory (this could imply network issue)
+swupd-update-partition: Update failed temporarily.
+
+code 500, message test server is intentionally down
+"GET /10/Manifest.MoM.tar HTTP/1.1" 500 -
+code 500, message test server is intentionally down
+"GET /10/Manifest.MoM.tar HTTP/1.1" 500 -
+code 500, message test server is intentionally down
+"GET /10/Manifest.MoM.tar HTTP/1.1" 500 -
+code 500, message test server is intentionally down
+"GET /10/Manifest.MoM.tar HTTP/1.1" 500 -
+'''.format(
+    uuid=self.PARTUUID,
+    url=url
+)
+            self.update_partition(qemu, cmd, expected, 20, network_error=0)
+
+            # No reboot, we are done.
+            return False
+
+        setattr(self, 'update_image_via_http', update_image_via_http)
+        self.do_update('test_update_partition', self.IMAGE_MODIFY.UPDATES, have_zero_packs=True)
+
+    def test_update_same_url_network_4(self):
+        """
+        Same as test_update_same_url, but with network errors before fifth HTTP request.
+        """
+
+        def update_image_via_http(qemu):
+            self.skipTest('swupd does not detect this network error as it should - https://github.com/clearlinux/swupd-client/issues/323')
+
+            self.maxDiff = None
+            url = 'http://%s' % self.HTTPD_SERVER
+
+            # Update, with source, with formatting.  For this we need to
+            # set the content URL in the source partition for this and
+            # remove it when done.
+            cmd = 'echo "{0}"  >/.swupd-contenturl && swupd-update-partition -c {0} -p /dev/disk/by-partuuid/{1} -m 20 -f "mkfs.ext4 -F /dev/disk/by-partuuid/{1}" -F -s /; ret=$?; rm /.swupd-contenturl; [ $ret -eq 2 ]'.format(url, self.PARTUUID)
+            # Some /etc files get modified at runtime due to the writable
+            # rootfs and thus do not match.
+            expected = '''swupd-update-partition: Bind-mounting source tree.
+swupd-update-partition: mount -obind,ro / /tmp/swupd-mount-source.X
+swupd-update-partition: Updating to 20 from {url}.
+swupd-update-partition: Reinstalling from scratch.
+swupd-update-partition: Formatting partition.
+swupd-update-partition: mkfs.ext4 -F /dev/disk/by-partuuid/87654321-9abc-def0-0fed-cba987654320
+...
+swupd-update-partition: mount /dev/disk/by-partuuid/{uuid} /tmp/swupd-mount.X
+swupd-update-partition: Copy from source /.
+swupd-update-partition: Content URL unchanged, trying to update.
+swupd-update-partition: swupd update -c {url} -v file:///tmp/swupd-version.X -S /tmp/swupd-mount.X/swupd-state -p /tmp/swupd-mount.X
+swupd-client software ...
+
+Attempting to download version string to memory
+Update started.
+Preparing to update from 10 to 20
+
+TODO: insert actual output.
+'''.format(
+    uuid=self.PARTUUID,
+    url=url
+)
+            self.update_partition(qemu, cmd, expected, 20, network_error=4)
+
+            # No reboot, we are done.
+            return False
+
+        setattr(self, 'update_image_via_http', update_image_via_http)
+        self.do_update('test_update_partition', self.IMAGE_MODIFY.UPDATES, have_zero_packs=True)