]> code.ossystems Code Review - openembedded-core.git/commit
oeqa/selftest: fix test_incremental_image_generation for changes in log output
authorYi Zhao <yi.zhao@windriver.com>
Wed, 31 Dec 2014 02:59:42 +0000 (10:59 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 1 Sep 2015 20:30:28 +0000 (21:30 +0100)
commitafecc84cdd491789e62fb191a4f03de61e408629
treecb13079f1a67c9db943bcc2073c17fa14116d657
parent99ac0971aecb1b6bc113da28b79d169095e6b671
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)

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>
meta/lib/oeqa/selftest/buildoptions.py