[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH] oeqa/selftest: fix test_incremental_image_generation for changes in log output
From:       yi.zhao () windriver ! com (Yi Zhao)
Date:       2014-12-31 2:59:42
Message-ID: 1419994782-32245-1-git-send-email-yi.zhao () windriver ! com
[Download RAW message or body]

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

Signed-off-by: Yi Zhao <yi.zhao at windriver.com>
---
 meta/lib/oeqa/selftest/buildoptions.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/selftest/buildoptions.py \
b/meta/lib/oeqa/selftest/buildoptions.py index 381741e..926ffe9 100644
--- a/meta/lib/oeqa/selftest/buildoptions.py
+++ b/meta/lib/oeqa/selftest/buildoptions.py
@@ -20,12 +20,15 @@ class ImageOptionsTests(oeSelfTest):
         self.write_config('INC_RPM_IMAGE_GEN = "1"')
         self.append_config('IMAGE_FEATURES += "ssh-server-openssh"')
         bitbake("core-image-minimal")
-        res = runCmd("grep 'Installing openssh-sshd' %s" % \
(os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), "temp/log.do_rootfs")), \
ignore_status=True) +        log_data_file = os.path.join(get_bb_var("WORKDIR", \
"core-image-minimal"), "temp/log.do_rootfs") +        log_data_created = \
ftools.read_file(log_data_file) +        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) \
                self.remove_config('IMAGE_FEATURES += "ssh-server-openssh"')
-        self.assertEqual(0, res.status, msg="No match for openssh-sshd in \
log.do_rootfs") +        self.assertTrue(incremental_created, msg = "Match failed \
in:\n%s" % log_data_created)  bitbake("core-image-minimal")
-        res = runCmd("grep 'Removing openssh-sshd' %s" \
%(os.path.join(get_bb_var("WORKDIR", "core-image-minimal"), \
                "temp/log.do_rootfs")),ignore_status=True)
-        self.assertEqual(0, res.status, msg="openssh-sshd was not removed from \
image") +        log_data_removed = ftools.read_file(log_data_file)
+        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) +       \
self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) \
  @testcase(925)
     def test_rm_old_image(self):
-- 
1.7.9.5


[prev in list] [next in list] [prev in thread] [next in thread]