summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/cli_tests.py
diff options
context:
space:
mode:
authorMichael Goulish <mgoulish@apache.org>2011-02-28 18:00:10 +0000
committerMichael Goulish <mgoulish@apache.org>2011-02-28 18:00:10 +0000
commit3641a728fff74badbf3c5e1fb8547aba395e703b (patch)
treec7dd49d9d78b095ecf00e519235abc94bc898b05 /qpid/cpp/src/tests/cli_tests.py
parent778c3d4060448014eccb72169c0b281c13f276d2 (diff)
downloadqpid-python-3641a728fff74badbf3c5e1fb8547aba395e703b.tar.gz
What was a single test -- sasl_fed_ex -- is now
4 tests with a common core. They are: sasl_fed_ex_dynamic sasl_fed_ex_link sasl_fed_ex_queue sasl_fed_ex_route ( and the common core is sasl_fed_ex ) These tests correspond to the 4 different ways that the qpid-route command has of making links, or links+routes. All those pathways have to be modified so that the new "mechanism" argument information can be passed down and used -- so that you can specify a SASL mechnism to be used on the interbroker link that you create. ( So -- the qpid-route command also had to be modified to propagate the mechanism info with all 4 subcommands. ) Since the SASL mechanism is owned by the link, these tests check that the link comes up and becomes operational. Finally, I modified the sasl-mechanism flag in qpid-route to call it "client-sasl-mechanism" to better distinguish between the SASL mechanism used in the created route -- and the SASL mechanism (if any) that is used when the qpid-route client itself connects to the broker that it is talking to. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1075452 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/cli_tests.py')
-rwxr-xr-xqpid/cpp/src/tests/cli_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/cli_tests.py b/qpid/cpp/src/tests/cli_tests.py
index 53c64e055c..6c75927461 100755
--- a/qpid/cpp/src/tests/cli_tests.py
+++ b/qpid/cpp/src/tests/cli_tests.py
@@ -425,7 +425,7 @@ class CliTests(TestBase010):
qmf = self.qmf
ret = self.qpid_route_api("dynamic add "
- + " --sasl-mechanism PLAIN "
+ + " --client-sasl-mechanism PLAIN "
+ "guest/guest@localhost:"+str(self.broker.port) + " "
+ str(self.remote_host())+":"+str(self.remote_port()) + " "
+"amq.direct")
@@ -444,7 +444,7 @@ class CliTests(TestBase010):
qmf = self.qmf
ret = self.qpid_route_api("dynamic add "
- + " --sasl-mechanism PLAIN "
+ + " --client-sasl-mechanism PLAIN "
+ "localhost:"+str(self.broker.port) + " "
+ str(self.remote_host())+":"+str(self.remote_port()) + " "
+"amq.direct")