diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-10-22 13:16:43 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-10-22 13:16:43 +0000 |
| commit | 220f7ec525b29efd94113f2d3be511c5156c3b3a (patch) | |
| tree | 4a6b950101c98bd84ae28f341652522a940bca94 /qpid/cpp/src/tests | |
| parent | 7348c75f13673a6a0434bfddc8dff474ba6b69c2 (diff) | |
| download | qpid-python-linearstore.tar.gz | |
QPID-4984: WIP - Merge from trunk r.1534626.linearstore
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/linearstore@1534627 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rwxr-xr-x | qpid/cpp/src/tests/acl.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/acl.py b/qpid/cpp/src/tests/acl.py index 666ae46a39..fe8254a6fa 100755 --- a/qpid/cpp/src/tests/acl.py +++ b/qpid/cpp/src/tests/acl.py @@ -382,8 +382,7 @@ class ACLTests(TestBase010): aclf.close() result = self.reload_acl() - expected = "ding is not a valid value for 'policytype', possible values are one of" \ - " { 'ring' 'ring_strict' 'flow_to_disk' 'reject' }"; + expected = "ding is not a valid value for 'policytype', possible values are one of" if (result.find(expected) == -1): self.fail(result) @@ -802,6 +801,7 @@ class ACLTests(TestBase010): aclf.write('acl allow bob@QPID delete queue name=q4\n') aclf.write('acl allow bob@QPID create queue name=q5 maxqueuesize=1000 maxqueuecount=100\n') aclf.write('acl allow bob@QPID create queue name=q6 queuemaxsizelowerlimit=50 queuemaxsizeupperlimit=100 queuemaxcountlowerlimit=50 queuemaxcountupperlimit=100\n') + aclf.write('acl allow bob@QPID create queue name=q7 policytype=self-destruct\n') aclf.write('acl allow anonymous all all\n') aclf.write('acl deny all all') aclf.close() @@ -915,6 +915,17 @@ class ACLTests(TestBase010): self.fail("ACL should allow queue create request for q2 with exclusive=true policytype=ring"); try: + session.queue_declare(queue="q7", arguments={"qpid.policy_type": "ring"}) + self.fail("ACL should not allow queue create request for q7 with policytype=ring"); + except qpid.session.SessionException, e: + session = self.get_session('bob','bob') + + try: + session.queue_declare(queue="q7", arguments={"qpid.policy_type": "self-destruct"}) + except qpid.session.SessionException, e: + self.fail("ACL should allow queue create request for q7 with policytype=self-destruct"); + + try: session.queue_declare(queue="q3") session.queue_declare(queue="q4") except qpid.session.SessionException, e: |