Repository: qpid-dispatch Updated Branches: refs/heads/master 439950b1e -> ed515fb70
DISPATCH-1057 - Additional fix. Move comments to separate lines. Renamed shadow variables Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/ed515fb7 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/ed515fb7 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/ed515fb7 Branch: refs/heads/master Commit: ed515fb7009913b08e6c61fd3a6f8175be1380df Parents: 439950b Author: Ganesh Murthy <gmur...@redhat.com> Authored: Thu Jun 28 18:06:21 2018 -0400 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Thu Jun 28 18:06:21 2018 -0400 ---------------------------------------------------------------------- tests/system_tests_console.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/ed515fb7/tests/system_tests_console.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_console.py b/tests/system_tests_console.py index f938e6b..eb0fb1c 100644 --- a/tests/system_tests_console.py +++ b/tests/system_tests_console.py @@ -32,8 +32,10 @@ import shutil from proton import Url, SSLDomain, SSLUnavailable, SASL from system_test import main_module + class ConsoleTest(system_test.TestCase): """Run console tests""" + @classmethod def setUpClass(cls): super(ConsoleTest, cls).setUpClass() @@ -45,17 +47,17 @@ class ConsoleTest(system_test.TestCase): cls.router = cls.tester.qdrouterd('test-router', config) def run_console_test(self): - cwd = os.getcwd() # expecting <base-path>/build/system_test.dir/system_tests_console/ConsoleTest/test_console - # /foo/qpid-dispatch/build/system_test.dir/system_tests_console/ConsoleTest/test_console/ - # - # - # run_console_test.out + # expecting <base-path>/build/system_test.dir/system_tests_console/ConsoleTest/test_console + # /foo/qpid-dispatch/build/system_test.dir/system_tests_console/ConsoleTest/test_console/ + # run_console_test.out + cwd = os.getcwd() + def get_base(remove): - base = cwd.split('/')[:-remove] # path that ends with qpid-dispatch's home dir - test_cmd = '/'.join(base + ['build', 'console', 'node_modules', '.bin', 'mocha']) - test_dir = '/'.join(base + ['console', 'stand-alone', 'test']) - src_dir = '/'.join(base + ['console', 'stand-alone']) - return (base, test_cmd, test_dir, src_dir) + l_base = cwd.split('/')[:-remove] # path that ends with qpid-dispatch's home dir + l_test_cmd = '/'.join(l_base + ['build', 'console', 'node_modules', '.bin', 'mocha']) + l_test_dir = '/'.join(l_base + ['console', 'stand-alone', 'test']) + l_src_dir = '/'.join(l_base + ['console', 'stand-alone']) + return l_base, l_test_cmd, l_test_dir, l_src_dir (base, test_cmd, test_dir, src_dir) = get_base(6) found_src = os.path.isdir(src_dir) @@ -98,5 +100,6 @@ class ConsoleTest(system_test.TestCase): def test_console(self): self.run_console_test() + if __name__ == '__main__': unittest.main(main_module()) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
