diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/buildoptions.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/meta/lib/oeqa/selftest/buildoptions.py b/meta/lib/oeqa/selftest/buildoptions.py index a250cae0e1..00e73bd7ce 100644 --- a/meta/lib/oeqa/selftest/buildoptions.py +++ b/meta/lib/oeqa/selftest/buildoptions.py | |||
@@ -17,12 +17,15 @@ class ImageOptionsTests(oeSelfTest): | |||
17 | self.write_config('INC_RPM_IMAGE_GEN = "1"') | 17 | self.write_config('INC_RPM_IMAGE_GEN = "1"') |
18 | self.append_config('IMAGE_FEATURES += "ssh-server-openssh"') | 18 | self.append_config('IMAGE_FEATURES += "ssh-server-openssh"') |
19 | bitbake("core-image-minimal") | 19 | bitbake("core-image-minimal") |
20 | res = runCmd("grep 'Installing openssh-sshd' %s" % (os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs")), ignore_status=True) | 20 | log_data_file = os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs") |
21 | log_data_created = ftools.read_file(log_data_file) | ||
22 | incremental_created = re.search("NOTE: load old install solution for incremental install\nNOTE: old install solution not exist\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: Installing the following packages:.*packagegroup-core-ssh-openssh", log_data_created) | ||
21 | self.remove_config('IMAGE_FEATURES += "ssh-server-openssh"') | 23 | self.remove_config('IMAGE_FEATURES += "ssh-server-openssh"') |
22 | self.assertEqual(0, res.status, msg="No match for openssh-sshd in log.do_rootfs") | 24 | self.assertTrue(incremental_created, msg = "Match failed in:\n%s" % log_data_created) |
23 | bitbake("core-image-minimal") | 25 | bitbake("core-image-minimal") |
24 | res = runCmd("grep 'Removing openssh-sshd' %s" %(os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs")),ignore_status=True) | 26 | log_data_removed = ftools.read_file(log_data_file) |
25 | self.assertEqual(0, res.status, msg="openssh-sshd was not removed from image") | 27 | incremental_removed = re.search("NOTE: load old install solution for incremental install\nNOTE: creating new install solution for incremental install(\n.*)*NOTE: incremental removed:.*openssh-sshd-.*", log_data_removed) |
28 | self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) | ||
26 | 29 | ||
27 | @testcase(925) | 30 | @testcase(925) |
28 | def test_rm_old_image(self): | 31 | def test_rm_old_image(self): |