You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2018/03/29 17:49:34 UTC
qpid-dispatch git commit: DISPATCH-953: Restore cmdline self test;
fix to work out of source
Repository: qpid-dispatch
Updated Branches:
refs/heads/master cbbefa77f -> 03c000eb6
DISPATCH-953: Restore cmdline self test; fix to work out of source
Self test system_tests_cmdline_parsing was disabled under
DISPATCH-940 when the test failed unless dispatch was installed.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/03c000eb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/03c000eb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/03c000eb
Branch: refs/heads/master
Commit: 03c000eb6062cf830e777362d399a4de900f7412
Parents: cbbefa7
Author: Chuck Rolke <cr...@redhat.com>
Authored: Thu Mar 29 13:47:07 2018 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Thu Mar 29 13:47:07 2018 -0400
----------------------------------------------------------------------
tests/CMakeLists.txt | 2 +-
tests/system_tests_cmdline_parsing.py | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/03c000eb/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 359c268..939b51f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -108,7 +108,7 @@ foreach(py_test_module
system_tests_topology_addition
system_tests_disallow_link_resumable_link_route
system_tests_exchange_bindings
- # DISPATCH-940 test fails if dispatch not installed: system_tests_cmdline_parsing
+ system_tests_cmdline_parsing
${SYSTEM_TESTS_HTTP}
)
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/03c000eb/tests/system_tests_cmdline_parsing.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_cmdline_parsing.py b/tests/system_tests_cmdline_parsing.py
index 149c999..db7fc22 100644
--- a/tests/system_tests_cmdline_parsing.py
+++ b/tests/system_tests_cmdline_parsing.py
@@ -62,8 +62,9 @@ class CommandLineTest(TestCase):
:return:
"""
pipe = self.popen(
- ['qdrouterd', '-d', '-c',
- self.config.write(config_file_name), '-P', pid_file_name],
+ [os.path.join(os.environ.get('BUILD_DIR'), 'router', 'qdrouterd'), '-d',
+ '-I', os.path.join(os.environ.get('SOURCE_DIR'), 'python'),
+ '-c', self.config.write(config_file_name), '-P', pid_file_name],
stdout=PIPE, stderr=STDOUT, expect=Process.EXIT_OK)
out = pipe.communicate()[0]
wait_port(CommandLineTest.testport)
@@ -122,8 +123,9 @@ class CommandLineTest2(TestCase):
:return:
"""
pipe = self.popen(
- ['qdrouterd', '-d', '-c',
- self.config.write(config_file_name), '-P', pid_file_name],
+ [os.path.join(os.environ.get('BUILD_DIR'), 'router', 'qdrouterd'), '-d',
+ '-I', os.path.join(os.environ.get('SOURCE_DIR'), 'python'),
+ '-c', self.config.write(config_file_name), '-P', pid_file_name],
stdout=PIPE, stderr=STDOUT, expect=Process.EXIT_OK)
out = pipe.communicate()[0]
wait_port(CommandLineTest2.testport)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org