[oe-commits] [openembedded-core] 24/32: testimage.bbclass: move codes into testimage_main

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 61ecf533fe8c5b4077d80259567225546f9274b8
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Fri Jun 1 13:03:10 2018 +0800

    testimage.bbclass: move codes into testimage_main
    
    testimage-auto is expected to run testimage task's codes automatically.
    But in fact, it's currently missing some codes, including testimage_sanity
    and create_rpm_index.
    
    This leads to the problem of unexpected runtime failure of test_dnf_makecache.
    The error message is as below.
    
      RESULTS - dnf.DnfRepoTest.test_dnf_makecache - Testcase 1744: ERROR
    
    This error is caused by the fact that create_rpm_index is not executed
    before running the tests.
    
    There's no reason why such codes should not be in testimage_main, so
    move them into it.
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/testimage.bbclass | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 14252ff..c17a7c6 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -117,13 +117,6 @@ testimage_dump_host () {
 }
 
 python do_testimage() {
-
-    testimage_sanity(d)
-
-    if (d.getVar('IMAGE_PKGTYPE') == 'rpm'
-       and ('dnf' in d.getVar('TEST_SUITES') or 'auto' in d.getVar('TEST_SUITES'))):
-        create_rpm_index(d)
-
     testimage_main(d)
 }
 
@@ -159,6 +152,12 @@ def testimage_main(d):
         """
         raise RuntimeError
 
+    testimage_sanity(d)
+
+    if (d.getVar('IMAGE_PKGTYPE') == 'rpm'
+       and ('dnf' in d.getVar('TEST_SUITES') or 'auto' in d.getVar('TEST_SUITES'))):
+        create_rpm_index(d)
+
     logger = make_logger_bitbake_compatible(logging.getLogger("BitBake"))
     pn = d.getVar("PN")
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.