summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/contrib
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-07-30 19:25:14 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 11:27:54 +0100
commitf9eb958a8a3062a0f7e525177518bc761f0c0bef (patch)
treec5bdc381be0ea71d567cb8dc6ccf3fa5fa2eb429 /bitbake/lib/toaster/contrib
parentba667a0908db537c72aa124a2a80ee374260d1fa (diff)
downloadpoky-f9eb958a8a3062a0f7e525177518bc761f0c0bef.tar.gz
bitbake: toaster: tts: fix startup and cleanup for managed mode
This patch fixes the toaster startup and database cleanup for managed mode. It is needed because the toaster script thinks it has been called with "source" instead of being executed as independent script if not called through bash. (Bitbake rev: f08ce41f1137f268049ef8345462aa58b233e50b) 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/lib/toaster/contrib')
-rwxr-xr-xbitbake/lib/toaster/contrib/tts/runner.py1
-rw-r--r--bitbake/lib/toaster/contrib/tts/tests.py7
2 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/contrib/tts/runner.py b/bitbake/lib/toaster/contrib/tts/runner.py
index dac632cffa..3fd1b66e64 100755
--- a/bitbake/lib/toaster/contrib/tts/runner.py
+++ b/bitbake/lib/toaster/contrib/tts/runner.py
@@ -122,6 +122,7 @@ def execute_tests(dir_under_test, testname):
122 # we disable the broad-except because we want to actually catch all possible exceptions 122 # we disable the broad-except because we want to actually catch all possible exceptions
123 try: 123 try:
124 config.logger.debug("Discovered test clases: %s", pprint.pformat(tests)) 124 config.logger.debug("Discovered test clases: %s", pprint.pformat(tests))
125 unittest.installHandler()
125 suite = unittest.TestSuite() 126 suite = unittest.TestSuite()
126 loader = unittest.TestLoader() 127 loader = unittest.TestLoader()
127 result = unittest.TestResult() 128 result = unittest.TestResult()
diff --git a/bitbake/lib/toaster/contrib/tts/tests.py b/bitbake/lib/toaster/contrib/tts/tests.py
index eb91947d83..fd6aa3b8bb 100644
--- a/bitbake/lib/toaster/contrib/tts/tests.py
+++ b/bitbake/lib/toaster/contrib/tts/tests.py
@@ -76,7 +76,7 @@ class TestHTML5Compliance(unittest.TestCase):
76 setup.expect(r"Enter your option: ") 76 setup.expect(r"Enter your option: ")
77 setup.sendline('0') 77 setup.sendline('0')
78 78
79 self.child = pexpect.spawn("%s/bitbake/bin/toaster webport=%d nobrowser" % (config.TESTDIR, config.TOASTER_PORT)) 79 self.child = pexpect.spawn("bash", ["%s/bitbake/bin/toaster" % config.TESTDIR, "webport=%d" % config.TOASTER_PORT, "nobrowser"], cwd=self.crtdir)
80 self.child.logfile = sys.stdout 80 self.child.logfile = sys.stdout
81 self.child.expect("Toaster is now running. You can stop it with Ctrl-C") 81 self.child.expect("Toaster is now running. You can stop it with Ctrl-C")
82 82
@@ -101,5 +101,6 @@ class TestHTML5Compliance(unittest.TestCase):
101 self.child.kill(signal.SIGINT) 101 self.child.kill(signal.SIGINT)
102 time.sleep(1) 102 time.sleep(1)
103 os.chdir(self.origdir) 103 os.chdir(self.origdir)
104# if os.path.exists(os.path.join(self.crtdir, "toaster.sqlite")): 104 toaster_sqlite_path = os.path.join(self.crtdir, "toaster.sqlite")
105# os.remove(os.path.join(self.crtdir, "toaster.sqlite")) 105 if os.path.exists(toaster_sqlite_path):
106 os.remove(toaster_sqlite_path)