diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2014-12-31 10:59:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-01 21:37:32 +0100 |
commit | d526b3f9ac83cac6a7ee7aaf119567284096a39d (patch) | |
tree | 88eb87c81f9cb6a31a1935123fe2b03da1f9f7e2 /meta/lib | |
parent | e74c4a5ff4ed7eb5eb648e2cb382ba8f9e25662e (diff) | |
download | poky-d526b3f9ac83cac6a7ee7aaf119567284096a39d.tar.gz |
oeqa/selftest: fix test_incremental_image_generation for changes in log output
test_incremental_image_generation case failed because the log output
chanaged:
FAIL: test_incremental_image_generation (oeqa.selftest.buildoptions.ImageOptionsTests)
----------------------------------------------------------------------
Traceback (most recent call last):
File
"/buildarea3/yzhao1/poky-build/meta/lib/oeqa/utils/decorators.py", line 90, in wrapped_f
return func(*args)
File
"/buildarea3/yzhao1/poky-build/meta/lib/oeqa/selftest/buildoptions.py", line 25, in test_incremental_image_generation
self.assertEqual(0, res.status, msg="No match for openssh-sshd in log.do_rootfs")
AssertionError: 0 != 1 : No match for openssh-sshd in log.do_rootfs
----------------------------------------------------------------------
Using re search instead grep
(From OE-Core rev: 1872a9430cec0c61f1ec349df198160addd430de)
(From OE-Core rev: afecc84cdd491789e62fb191a4f03de61e408629)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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): |