From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 31 Aug 2017 16:24:42 +0000 (+0100)
Subject: selftest/prservice: Adapt to BB_SERVER_TIMEOUT
X-Git-Tag: 2017-10~368
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=811edd95420e907e71b5c7646bde5013b43d4c73;p=openembedded-core.git

selftest/prservice: Adapt to BB_SERVER_TIMEOUT

In the memory resident mode, the user may not see a message about the server
starting, it would be in the cookerdeamon logfile. We don't need this to
test the server is functioning correctly so just drop the test.

Add in an extra check that the file we expected to be created was
created when exporting PR values.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/selftest/cases/prservice.py b/meta/lib/oeqa/selftest/cases/prservice.py
index ed36f0fed7..479e520618 100644
--- a/meta/lib/oeqa/selftest/cases/prservice.py
+++ b/meta/lib/oeqa/selftest/cases/prservice.py
@@ -42,7 +42,6 @@ class BitbakePrTests(OESelftestTestCase):
         res = bitbake(package_name, ignore_status=True)
         self.delete_recipeinc(package_name)
         self.assertEqual(res.status, 0, msg=res.output)
-        self.assertTrue("NOTE: Started PRServer with DBfile" in res.output, msg=res.output)
 
     def config_pr_tests(self, package_name, package_type='rpm', pr_socket='localhost:0'):
         config_package_data = 'PACKAGE_CLASSES = "package_%s"' % package_type
@@ -73,6 +72,7 @@ class BitbakePrTests(OESelftestTestCase):
         exported_db_path = os.path.join(self.builddir, 'export.inc')
         export_result = runCmd("bitbake-prserv-tool export %s" % exported_db_path, ignore_status=True)
         self.assertEqual(export_result.status, 0, msg="PR Service database export failed: %s" % export_result.output)
+        self.assertTrue(os.path.exists(exported_db_path))
 
         if replace_current_db:
             current_db_path = os.path.join(get_bb_var('PERSISTENT_DIR'), 'prserv.sqlite3')