diff options
| author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-05-15 13:15:08 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-29 11:59:46 +0100 |
| commit | 29143915ae543f3cd389a7b1e32967ab42730e45 (patch) | |
| tree | 0d968e896f85073e5b19e0244e2729f9bd8cec01 | |
| parent | 356809ff4019eaef19e1f768db5b77fbcdd482e4 (diff) | |
| download | poky-29143915ae543f3cd389a7b1e32967ab42730e45.tar.gz | |
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>
| -rw-r--r-- | bitbake/lib/toaster/contrib/tts/backlog.txt | 2 | ||||
| -rwxr-xr-x | bitbake/lib/toaster/contrib/tts/launcher.py | 2 | ||||
| -rwxr-xr-x | bitbake/lib/toaster/contrib/tts/runner.py | 2 | ||||
| -rw-r--r-- | bitbake/lib/toaster/contrib/tts/tests.py | 2 |
4 files changed, 3 insertions, 5 deletions
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 @@ | |||
| 1 | michaelw/toaster-frontend-cleanups|PENDING | ||
| 2 | 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__": | |||
| 87 | errtext = None | 87 | errtext = None |
| 88 | out = None | 88 | out = None |
| 89 | try: | 89 | try: |
| 90 | out = shellutils.run_shell_cmd("./runner.py %s" % next_task) | 90 | out = shellutils.run_shell_cmd("%s %s" % (os.path.join(os.path.dirname(__file__), "runner.py"), next_task)) |
| 91 | pass | 91 | pass |
| 92 | except ShellCmdException as e: | 92 | except ShellCmdException as e: |
| 93 | print("Failed while running the test runner: %s", e) | 93 | 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(): | |||
| 168 | # cleanup ! | 168 | # cleanup ! |
| 169 | def clean_up(testdir): | 169 | def clean_up(testdir): |
| 170 | # TODO: delete the test dir | 170 | # TODO: delete the test dir |
| 171 | #run_shell_cmd("rm -rf -- '%s'" % testdir) | 171 | run_shell_cmd("rm -rf -- '%s'" % testdir) |
| 172 | pass | 172 | pass |
| 173 | 173 | ||
| 174 | if __name__ == "__main__": | 174 | 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): | |||
| 44 | 44 | ||
| 45 | def test_start_interactive_mode(self): | 45 | def test_start_interactive_mode(self): |
| 46 | try: | 46 | try: |
| 47 | run_shell_cmd("bash -c 'source %s/oe-init-build-env && source toaster start && source toaster stop'" % config.testdir, config.testdir) | 47 | run_shell_cmd("bash -c 'source %s/oe-init-build-env && source toaster start webport=56789 && source toaster stop'" % config.testdir, config.testdir) |
| 48 | except ShellCmdException as e: | 48 | except ShellCmdException as e: |
| 49 | self.fail("Failed starting interactive mode: %s" % (e)) | 49 | self.fail("Failed starting interactive mode: %s" % (e)) |
| 50 | 50 | ||
