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/06/01 20:37:36 UTC
[4/4] qpid-dispatch git commit: DISPATCH-1011: Fix merge errors found
by tox; delete usused defs
DISPATCH-1011: Fix merge errors found by tox; delete usused defs
This closes #311
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/c38f99e2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/c38f99e2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/c38f99e2
Branch: refs/heads/master
Commit: c38f99e2aa9836b326cc8d1e66048281e0ef0829
Parents: 729ada0
Author: Chuck Rolke <cr...@redhat.com>
Authored: Fri Jun 1 16:35:20 2018 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Fri Jun 1 16:35:20 2018 -0400
----------------------------------------------------------------------
src/policy.c | 5 ++---
tests/system_tests_policy.py | 10 ++++++----
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c38f99e2/src/policy.c
----------------------------------------------------------------------
diff --git a/src/policy.c b/src/policy.c
index 43891da..33bd709 100644
--- a/src/policy.c
+++ b/src/policy.c
@@ -581,11 +581,10 @@ bool is_token_sep(char testc)
//
// Size of 'easy' temporary copy of allowed input string
#define QPALN_SIZE 1024
-// Wildcard character
+// Wildcard character at end of source/target name strings
#define QPALN_WILDCARD '*'
-#define QPALN_USERBUFSIZE 300
-#define MIN(a,b) (((a)<(b))?(a):(b))\
+#define MIN(a,b) (((a)<(b))?(a):(b))
/**
* Given a username and a list of allowed link names
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/c38f99e2/tests/system_tests_policy.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_policy.py b/tests/system_tests_policy.py
index ab02e6e..07ed91e 100644
--- a/tests/system_tests_policy.py
+++ b/tests/system_tests_policy.py
@@ -812,9 +812,10 @@ class PolicyLinkNamePatternTest(TestCase):
exception = False
try:
qdm_out = self.run_qdmanage('create --type=vhost --name=DISPATCH-1993-3 --stdin', input=self.disallowed_source_pattern1())
- except Exception, e:
+ except Exception as e:
exception = True
- self.assertTrue("InternalServerErrorStatus: PolicyError: \"Policy 'DISPATCH-1993-3' is invalid:" in e.message)
+ self.assertTrue("InternalServerErrorStatus: PolicyError:" in e.message)
+ self.assertTrue("Policy 'DISPATCH-1993-3' is invalid:" in e.message)
self.assertTrue(exception)
# attempt another create that should be rejected - name subst must be prefix or suffix
@@ -822,9 +823,10 @@ class PolicyLinkNamePatternTest(TestCase):
exception = False
try:
qdm_out = self.run_qdmanage('create --type=vhost --name=DISPATCH-1993-3 --stdin', input=self.disallowed_source_pattern2())
- except Exception, e:
+ except Exception as e:
exception = True
- self.assertTrue("InternalServerErrorStatus: PolicyError: \"Policy 'DISPATCH-1993-3' is invalid:" in e.message)
+ self.assertTrue("InternalServerErrorStatus: PolicyError:" in e.message)
+ self.assertTrue("Policy 'DISPATCH-1993-3' is invalid:" in e.message)
self.assertTrue(exception)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org