bitbake: toaster/tts: Fix tests

(Bitbake rev: f4257f8df3be0627bdc7209fe34d674c42baf8d2)

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/toaster/contrib/tts/backlog.txt b/bitbake/lib/toaster/contrib/tts/backlog.txt
deleted file mode 100644 (file)
index 6f92f7a..0000000
--- 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 5b63bc1de6527328864b6efe445f43003d3bac94..90c6d95c5852c09298922db8e0aa2e79a4aa6c34 100755 (executable)
--- 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 d2a6099bdb46dd429214ad70d96b5ea5597976e5..f55c4934cc5e7d4b06b2686a15de6f3391259736 100755 (executable)
--- 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 3d4cfea2b329542386f594fd85338df25f32460f..2e630db5750c9a5aaf243f90b1f54526eba48480 100644 (file)
--- 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))