Repository: qpid-dispatch Updated Branches: refs/heads/master a62be32f1 -> 85a581394
DISPATCH-1024 - Fix for system_tests_policy urls using user and password Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/85a58139 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/85a58139 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/85a58139 Branch: refs/heads/master Commit: 85a581394f6c57ba9f8a201a2e1769f4887b5824 Parents: a62be32 Author: Fernando Giorgetti <[email protected]> Authored: Tue Jun 5 17:32:38 2018 -0300 Committer: Fernando Giorgetti <[email protected]> Committed: Tue Jun 5 17:32:38 2018 -0300 ---------------------------------------------------------------------- tests/system_tests_policy.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/85a58139/tests/system_tests_policy.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_policy.py b/tests/system_tests_policy.py index 9fdd43b..d4c30f0 100644 --- a/tests/system_tests_policy.py +++ b/tests/system_tests_policy.py @@ -23,7 +23,7 @@ from __future__ import absolute_import from __future__ import print_function import unittest as unittest -import os, json +import os, json, re from system_test import TestCase, Qdrouterd, main_module, Process, TIMEOUT, DIR from subprocess import PIPE, STDOUT from proton import ConnectionException, Timeout @@ -115,7 +115,7 @@ class LoadPolicyFromFolder(TestCase): def run_qdmanage(self, cmd, input=None, expect=Process.EXIT_OK): p = self.popen( - ['qdmanage'] + cmd.split(' ') + ['--bus', 'u1:password@' + self.address(), '--indent=-1', '--timeout', str(TIMEOUT)], + ['qdmanage'] + cmd.split(' ') + ['--bus', re.sub(r'amqp://', 'amqp://u1:password@', self.address()), '--indent=-1', '--timeout', str(TIMEOUT)], stdin=PIPE, stdout=PIPE, stderr=STDOUT, expect=expect, universal_newlines=True) out = p.communicate(input)[0] @@ -398,7 +398,7 @@ class VhostPolicyNameField(TestCase): def run_qdmanage(self, cmd, input=None, expect=Process.EXIT_OK): p = self.popen( - ['qdmanage'] + cmd.split(' ') + ['--bus', 'u1:password@' + self.address(), '--indent=-1', '--timeout', str(TIMEOUT)], + ['qdmanage'] + cmd.split(' ') + ['--bus', re.sub(r'amqp://', 'amqp://u1:password@', self.address()), '--indent=-1', '--timeout', str(TIMEOUT)], stdin=PIPE, stdout=PIPE, stderr=STDOUT, expect=expect, universal_newlines=True) out = p.communicate(input)[0] @@ -631,7 +631,7 @@ class PolicyLinkNamePatternTest(TestCase): def run_qdmanage(self, cmd, input=None, expect=Process.EXIT_OK): p = self.popen( - ['qdmanage'] + cmd.split(' ') + ['--bus', 'u1:password@' + self.address(), '--indent=-1', '--timeout', str(TIMEOUT)], + ['qdmanage'] + cmd.split(' ') + ['--bus', re.sub(r'amqp://', 'amqp://u1:password@', self.address()), '--indent=-1', '--timeout', str(TIMEOUT)], stdin=PIPE, stdout=PIPE, stderr=STDOUT, expect=expect, universal_newlines=True) out = p.communicate(input)[0] @@ -857,7 +857,7 @@ class PolicyHostamePatternTest(TestCase): def run_qdmanage(self, cmd, input=None, expect=Process.EXIT_OK): p = self.popen( - ['qdmanage'] + cmd.split(' ') + ['--bus', 'u1:password@' + self.address(), '--indent=-1', '--timeout', str(TIMEOUT)], + ['qdmanage'] + cmd.split(' ') + ['--bus', re.sub(r'amqp://', 'amqp://u1:password@', self.address()), '--indent=-1', '--timeout', str(TIMEOUT)], stdin=PIPE, stdout=PIPE, stderr=STDOUT, expect=expect) out = p.communicate(input)[0] try: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
