summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-07-30 19:25:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 11:27:54 +0100
commite6419ccd93e87e730c0a6dba7a15e0ba2b986fff (patch)
treee4649ce0185ab158f164f214122416e2bc367e5e /bitbake
parentada494d3dd2ab3e51c33781ee59fb2b716039aec (diff)
downloadpoky-e6419ccd93e87e730c0a6dba7a15e0ba2b986fff.tar.gz
bitbake: toaster: tts: make sure to import data
Importing data from the layer index should be part of the setup because otherwise we have no reliable database configuration. This patch selects the first option for importing the database configuration file. (Bitbake rev: 86a69d294ace41bd109db97b753554ccc8f3dac0) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/contrib/tts/tests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/contrib/tts/tests.py b/bitbake/lib/toaster/contrib/tts/tests.py
index 8d1964790f..9acef46a38 100644
--- a/bitbake/lib/toaster/contrib/tts/tests.py
+++ b/bitbake/lib/toaster/contrib/tts/tests.py
@@ -62,11 +62,12 @@ class TestHTML5Compliance(unittest.TestCase):
62 self.cleanup_database = False 62 self.cleanup_database = False
63 os.chdir(self.crtdir) 63 os.chdir(self.crtdir)
64 if not os.path.exists(os.path.join(self.crtdir, "toaster.sqlite")): 64 if not os.path.exists(os.path.join(self.crtdir, "toaster.sqlite")):
65 self.cleanup_database = False 65 self.cleanup_database = True
66 run_shell_cmd("%s/bitbake/lib/toaster/manage.py syncdb --noinput" % config.TESTDIR) 66 run_shell_cmd("%s/bitbake/lib/toaster/manage.py syncdb --noinput" % config.TESTDIR)
67 run_shell_cmd("%s/bitbake/lib/toaster/manage.py migrate orm" % config.TESTDIR) 67 run_shell_cmd("%s/bitbake/lib/toaster/manage.py migrate orm" % config.TESTDIR)
68 run_shell_cmd("%s/bitbake/lib/toaster/manage.py migrate bldcontrol" % config.TESTDIR) 68 run_shell_cmd("%s/bitbake/lib/toaster/manage.py migrate bldcontrol" % config.TESTDIR)
69 run_shell_cmd("%s/bitbake/lib/toaster/manage.py loadconf %s/meta-yocto/conf/toasterconf.json" % (config.TESTDIR, config.TESTDIR)) 69 run_shell_cmd("%s/bitbake/lib/toaster/manage.py loadconf %s/meta-yocto/conf/toasterconf.json" % (config.TESTDIR, config.TESTDIR))
70 run_shell_cmd("%s/bitbake/lib/toaster/manage.py lsupdates" % config.TESTDIR)
70 71
71 setup = pexpect.spawn("%s/bitbake/lib/toaster/manage.py checksettings" % config.TESTDIR) 72 setup = pexpect.spawn("%s/bitbake/lib/toaster/manage.py checksettings" % config.TESTDIR)
72 setup.logfile = sys.stdout 73 setup.logfile = sys.stdout