From 29143915ae543f3cd389a7b1e32967ab42730e45 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Fri, 15 May 2015 13:15:08 +0100 Subject: bitbake: toaster/tts: Fix tests (Bitbake rev: f4257f8df3be0627bdc7209fe34d674c42baf8d2) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/toaster/contrib/tts/backlog.txt | 2 -- bitbake/lib/toaster/contrib/tts/launcher.py | 2 +- bitbake/lib/toaster/contrib/tts/runner.py | 2 +- bitbake/lib/toaster/contrib/tts/tests.py | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 bitbake/lib/toaster/contrib/tts/backlog.txt (limited to 'bitbake/lib/toaster/contrib') diff --git a/bitbake/lib/toaster/contrib/tts/backlog.txt b/bitbake/lib/toaster/contrib/tts/backlog.txt deleted file mode 100644 index 6f92f7ae6e..0000000000 --- a/bitbake/lib/toaster/contrib/tts/backlog.txt +++ /dev/null @@ -1,2 +0,0 @@ -michaelw/toaster-frontend-cleanups|PENDING -adamian/test_0|PENDING diff --git a/bitbake/lib/toaster/contrib/tts/launcher.py b/bitbake/lib/toaster/contrib/tts/launcher.py index 5b63bc1de6..90c6d95c58 100755 --- a/bitbake/lib/toaster/contrib/tts/launcher.py +++ b/bitbake/lib/toaster/contrib/tts/launcher.py @@ -87,7 +87,7 @@ if __name__ == "__main__": errtext = None out = None try: - out = shellutils.run_shell_cmd("./runner.py %s" % next_task) + out = shellutils.run_shell_cmd("%s %s" % (os.path.join(os.path.dirname(__file__), "runner.py"), next_task)) pass except ShellCmdException as e: print("Failed while running the test runner: %s", e) diff --git a/bitbake/lib/toaster/contrib/tts/runner.py b/bitbake/lib/toaster/contrib/tts/runner.py index d2a6099bdb..f55c4934cc 100755 --- a/bitbake/lib/toaster/contrib/tts/runner.py +++ b/bitbake/lib/toaster/contrib/tts/runner.py @@ -168,7 +168,7 @@ def read_settings(): # cleanup ! def clean_up(testdir): # TODO: delete the test dir - #run_shell_cmd("rm -rf -- '%s'" % testdir) + run_shell_cmd("rm -rf -- '%s'" % testdir) pass if __name__ == "__main__": diff --git a/bitbake/lib/toaster/contrib/tts/tests.py b/bitbake/lib/toaster/contrib/tts/tests.py index 3d4cfea2b3..2e630db575 100644 --- a/bitbake/lib/toaster/contrib/tts/tests.py +++ b/bitbake/lib/toaster/contrib/tts/tests.py @@ -44,7 +44,7 @@ class TestPySystemStart(unittest.TestCase): def test_start_interactive_mode(self): try: - run_shell_cmd("bash -c 'source %s/oe-init-build-env && source toaster start && source toaster stop'" % config.testdir, config.testdir) + run_shell_cmd("bash -c 'source %s/oe-init-build-env && source toaster start webport=56789 && source toaster stop'" % config.testdir, config.testdir) except ShellCmdException as e: self.fail("Failed starting interactive mode: %s" % (e)) -- cgit v1.2.3-54-g00ecf