aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-05-15 13:15:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 11:58:38 +0100
commitf4257f8df3be0627bdc7209fe34d674c42baf8d2 (patch)
tree2c3f0a0769256133600ff3f7d327405c92b45bee
parentccf7f39d470fe6d743b58b1140c19cb8da31ecaf (diff)
downloadbitbake-f4257f8df3be0627bdc7209fe34d674c42baf8d2.tar.gz
toaster/tts: Fix tests
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
-rw-r--r--lib/toaster/contrib/tts/backlog.txt2
-rwxr-xr-xlib/toaster/contrib/tts/launcher.py2
-rwxr-xr-xlib/toaster/contrib/tts/runner.py2
-rw-r--r--lib/toaster/contrib/tts/tests.py2
4 files changed, 3 insertions, 5 deletions
diff --git a/lib/toaster/contrib/tts/backlog.txt b/lib/toaster/contrib/tts/backlog.txt
deleted file mode 100644
index 6f92f7ae6..000000000
--- a/lib/toaster/contrib/tts/backlog.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-michaelw/toaster-frontend-cleanups|PENDING
-adamian/test_0|PENDING
diff --git a/lib/toaster/contrib/tts/launcher.py b/lib/toaster/contrib/tts/launcher.py
index 5b63bc1de..90c6d95c5 100755
--- a/lib/toaster/contrib/tts/launcher.py
+++ b/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/lib/toaster/contrib/tts/runner.py b/lib/toaster/contrib/tts/runner.py
index d2a6099bd..f55c4934c 100755
--- a/lib/toaster/contrib/tts/runner.py
+++ b/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/lib/toaster/contrib/tts/tests.py b/lib/toaster/contrib/tts/tests.py
index 3d4cfea2b..2e630db57 100644
--- a/lib/toaster/contrib/tts/tests.py
+++ b/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))