summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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)