QPID-2894 - Added ACL stats to qpid-stat and a reload-file action to qpid-config.

            Ported the ACL tests to use the faster API.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292880 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 33 insertions, 29 deletions

diff --git a/qpid/cpp/src/tests/acl.py b/qpid/cpp/src/tests/acl.py
index 65d5242e51..16261795ff 100755
--- a/qpid/cpp/src/tests/acl.py
+++ b/qpid/cpp/src/tests/acl.py
@@ -48,8 +48,12 @@ class ACLTests(TestBase010):
         return connection.session(str(uuid4()))
 
     def reload_acl(self):
-        acl = self.qmf.getObjects(_class="acl")[0]    
-        return acl.reloadACLFile()
+        result = None
+        try:
+            self.broker_access.reloadAclFile()
+        except Exception, e:
+            result = str(e)
+        return result
 
     def get_acl_file(self):
         return ACLFile(self.config.defines.get("policy-file", "data_dir/policy.acl"))
@@ -59,7 +63,7 @@ class ACLTests(TestBase010):
         aclf.write('acl allow all all\n')
         aclf.close()
         TestBase010.setUp(self)
-        self.startQmf()
+        self.startBrokerAccess()
         self.reload_acl()
 
     def tearDown(self):
@@ -84,7 +88,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result) 
         
         session = self.get_session('bob','bob')
@@ -111,7 +115,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)       
         
         session = self.get_session('bob','bob')
@@ -144,7 +148,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()       
-        if (result.text.find("Insufficient tokens for acl definition",0,len(result.text)) == -1):
+        if (result.find("Insufficient tokens for acl definition",0,len(result)) == -1):
             self.fail("ACL Reader should reject the acl file due to empty group name")    
 
     def test_illegal_acl_formats(self):
@@ -157,7 +161,7 @@ class ACLTests(TestBase010):
         aclf.close()
         
         result = self.reload_acl()       
-        if (result.text.find("Unknown ACL permission",0,len(result.text)) == -1):
+        if (result.find("Unknown ACL permission",0,len(result)) == -1):
             self.fail(result)        
         
     def test_illegal_extension_lines(self):
@@ -173,13 +177,13 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()       
-        if (result.text.find("contains an illegal extension",0,len(result.text)) == -1):
+        if (result.find("contains an illegal extension",0,len(result)) == -1):
             self.fail(result)
 
-        if (result.text.find("Non-continuation line must start with \"group\" or \"acl\"",0,len(result.text)) == -1):
+        if (result.find("Non-continuation line must start with \"group\" or \"acl\"",0,len(result)) == -1):
             self.fail(result)
 
-    def test_llegal_extension_lines(self):
+    def test_illegal_extension_lines(self):
         """
         Test proper extention lines
         """
@@ -192,7 +196,7 @@ class ACLTests(TestBase010):
         aclf.close()
          
         result = self.reload_acl()
-        if (result.text.find("ACL format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)
 
     def test_user_realm(self):
@@ -207,7 +211,7 @@ class ACLTests(TestBase010):
         aclf.close()
          
         result = self.reload_acl()
-        if (result.text.find("Username 'bob' must contain a realm",0,len(result.text)) == -1):
+        if (result.find("Username 'bob' must contain a realm",0,len(result)) == -1):
             self.fail(result)
 
     def test_allowed_chars_for_username(self):
@@ -223,7 +227,7 @@ class ACLTests(TestBase010):
         aclf.close()
          
         result = self.reload_acl()
-        if (result.text.find("ACL format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)
 
         aclf = self.get_acl_file()
@@ -232,7 +236,7 @@ class ACLTests(TestBase010):
         aclf.close() 
 
         result = self.reload_acl()
-        if (result.text.find("Username \"joe$H@EXAMPLE.com\" contains illegal characters",0,len(result.text)) == -1):
+        if (result.find("Username \"joe$H@EXAMPLE.com\" contains illegal characters",0,len(result)) == -1):
             self.fail(result)
 
    #=====================================
@@ -252,7 +256,7 @@ class ACLTests(TestBase010):
         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' }"; 
-        if (result.text != expected): 
+        if (result.find(expected) == -1):
             self.fail(result)        
 
     def test_illegal_queue_size(self):
@@ -268,7 +272,7 @@ class ACLTests(TestBase010):
         result = self.reload_acl()       
         expected = "-1 is not a valid value for 'maxqueuesize', " \
                    "values should be between 0 and 9223372036854775807"; 
-        if (result.text != expected): 
+        if (result.find(expected) == -1):
             self.fail(result) 
 
         aclf = self.get_acl_file()
@@ -279,7 +283,7 @@ class ACLTests(TestBase010):
         result = self.reload_acl()       
         expected = "9223372036854775808 is not a valid value for 'maxqueuesize', " \
                    "values should be between 0 and 9223372036854775807";
-        if (result.text != expected): 
+        if (result.find(expected) == -1):
             self.fail(result) 
 
 
@@ -296,7 +300,7 @@ class ACLTests(TestBase010):
         result = self.reload_acl()       
         expected = "-1 is not a valid value for 'maxqueuecount', " \
                    "values should be between 0 and 9223372036854775807"; 
-        if (result.text != expected): 
+        if (result.find(expected) == -1):
             self.fail(result) 
 
         aclf = self.get_acl_file()
@@ -307,7 +311,7 @@ class ACLTests(TestBase010):
         result = self.reload_acl()       
         expected = "9223372036854775808 is not a valid value for 'maxqueuecount', " \
                    "values should be between 0 and 9223372036854775807";
-        if (result.text != expected): 
+        if (result.find(expected) == -1):
             self.fail(result) 
 
 
@@ -330,7 +334,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result) 
         
         session = self.get_session('bob','bob')
@@ -436,7 +440,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)     
         
         session = self.get_session('bob','bob')
@@ -556,7 +560,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)        
         
         session = self.get_session('bob','bob')
@@ -687,7 +691,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)        
         
         session = self.get_session('bob','bob')
@@ -805,7 +809,7 @@ class ACLTests(TestBase010):
         aclf.close()
 
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)
 
         bob = BrokerAdmin(self.config.broker, "bob", "bob")
@@ -844,7 +848,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)        
         
         session = self.get_session('bob','bob')
@@ -892,7 +896,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)        
         
         session = self.get_session('bob','bob')
@@ -937,7 +941,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)        
         
         session = self.get_session('bob','bob')
@@ -988,7 +992,7 @@ class ACLTests(TestBase010):
         aclf.close()        
         
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)        
         
         session = self.get_session('bob','bob')
@@ -1056,7 +1060,7 @@ class ACLTests(TestBase010):
         aclf.close()
 
         result = self.reload_acl()
-        if (result.text.find("format error",0,len(result.text)) != -1):
+        if (result):
             self.fail(result)
 
         ts = None