summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 17:24:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 23:30:03 +0100
commit24a938cea199f744a4e5ed34b887f10726ae3cb9 (patch)
treefaa909843fb373e51c8fc25e6b4940e3b6fca089 /meta/lib
parent1f3e46b6a1d12a597aa9baf82c91db12a8513f67 (diff)
downloadpoky-24a938cea199f744a4e5ed34b887f10726ae3cb9.tar.gz
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. (From OE-Core rev: 811edd95420e907e71b5c7646bde5013b43d4c73) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/prservice.py2
1 files changed, 1 insertions, 1 deletions
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):
42 res = bitbake(package_name, ignore_status=True) 42 res = bitbake(package_name, ignore_status=True)
43 self.delete_recipeinc(package_name) 43 self.delete_recipeinc(package_name)
44 self.assertEqual(res.status, 0, msg=res.output) 44 self.assertEqual(res.status, 0, msg=res.output)
45 self.assertTrue("NOTE: Started PRServer with DBfile" in res.output, msg=res.output)
46 45
47 def config_pr_tests(self, package_name, package_type='rpm', pr_socket='localhost:0'): 46 def config_pr_tests(self, package_name, package_type='rpm', pr_socket='localhost:0'):
48 config_package_data = 'PACKAGE_CLASSES = "package_%s"' % package_type 47 config_package_data = 'PACKAGE_CLASSES = "package_%s"' % package_type
@@ -73,6 +72,7 @@ class BitbakePrTests(OESelftestTestCase):
73 exported_db_path = os.path.join(self.builddir, 'export.inc') 72 exported_db_path = os.path.join(self.builddir, 'export.inc')
74 export_result = runCmd("bitbake-prserv-tool export %s" % exported_db_path, ignore_status=True) 73 export_result = runCmd("bitbake-prserv-tool export %s" % exported_db_path, ignore_status=True)
75 self.assertEqual(export_result.status, 0, msg="PR Service database export failed: %s" % export_result.output) 74 self.assertEqual(export_result.status, 0, msg="PR Service database export failed: %s" % export_result.output)
75 self.assertTrue(os.path.exists(exported_db_path))
76 76
77 if replace_current_db: 77 if replace_current_db:
78 current_db_path = os.path.join(get_bb_var('PERSISTENT_DIR'), 'prserv.sqlite3') 78 current_db_path = os.path.join(get_bb_var('PERSISTENT_DIR'), 'prserv.sqlite3')