Changeset 200

Timestamp:

08/19/08 08:38:17 (3 months ago)

Author:

Denis Bilenko <denis@ag-projects.com>

Hashname:

20080819063817-b2873-f8a1538c111122c2fc38f2650e6dadf1bb424721

Message:

decoupled XCAPClient from XCAPTest

* removed _resource suffix in get/put/delete methods
* put also checks that GET(PUT(x))=>x
* delete also checks that GET=>404

Location:

xcap/test

Files:

• common.py (modified) (3 diffs)
• test_attribute.py (modified) (1 diff)
• test_auth.py (modified) (1 diff)
• test_element.py (modified) (1 diff)
• test_etags.py (modified) (1 diff)
• test_nsbindings.py (modified) (1 diff)
• test_pidf.py (modified) (1 diff)
• test_presrules.py (modified) (1 diff)
• test_resourcelists.py (modified) (1 diff)
• test_rlsservices.py (modified) (2 diffs)
• test_subscribediff.py (modified) (4 diffs)

xcap/test/common.py

@@ -157 +157 @@
         return result
 
-    def get_resource(self, application, node=None, headers={}):
+    def get(self, application, node=None, headers={}):
         username, domain = self.username.split('@', 1)
         uri = "%s/%s/users/%s/index.xml" % (self.xcap_root, application, self.username)
         if node:
             uri += '~~' + node
-        r = self._execute_request("GET", uri, username, domain, self.password, headers)
-        self.status, self.headers, self.body = r.code, r.headers, r.body
-        return r
-
-    get=get_resource
-
-    def put_resource(self, application, resource, node=None, headers={}):
+        return self._execute_request("GET", uri, username, domain, self.password, headers)
+
+    def put(self, application, resource, node=None, headers={}):
         username, domain = self.username.split('@', 1)
         uri = "%s/%s/users/%s/index.xml" % (self.xcap_root, application, self.username)
         if node:
             uri += '~~' + node
-        r = self._execute_request("PUT", uri, username, domain, self.password, headers, resource)
-        self.status, self.headers, self.body = r.code, r.headers, r.body
-        return r
-
-    put = put_resource
-
-    def delete_resource(self, application, node=None, headers={}):
+        return self._execute_request("PUT", uri, username, domain, self.password, headers, resource)
+
+    def delete(self, application, node=None, headers={}):
         username, domain = self.username.split('@', 1)
         uri = "%s/%s/users/%s/index.xml" % (self.xcap_root, application, self.username)
         if node:
             uri += '~~' + node
-        r = self._execute_request("DELETE", uri, username, domain, self.password, headers)
-        self.status, self.headers, self.body = r.code, r.headers, r.body
-        return r
-
-    delete = delete_resource
-
-
-class XCAPTest(unittest.TestCase, XCAPClient):
-
-    def assertStatus(self, status, msg=None):
-        if isinstance(status, int):
-            if self.status != status:
+        return self._execute_request("DELETE", uri, username, domain, self.password, headers)
+
+
+class XCAPTest(unittest.TestCase):
+
+    XCAPClient = XCAPClient
+
+    @classmethod
+    def setupOptionParser(cls, parser):
+        cls.XCAPClient.setupOptionParser(parser)
+
+    def initialize(self, options, args = []):
+        self.options = options
+        self.args = args
+
+    def new_client(self):
+        client = self.XCAPClient()
+        client.initialize(self.options, self.args)
+        return client
+
+    def setUp(self):
+        self.client = self.new_client()
+
+    def assertStatus(self, r, status, msg=None):
+        if status is None:
+            return
+        elif isinstance(status, int):
+            if r.code != status:
                 if msg is None:
-                    msg = 'Status (%s) != %s' % (self.status, status)
+                    msg = 'Status (%s) != %s' % (r.code, status)
                 raise self.failureException(msg)
         else:
             ## status is a tuple or a list
-            if self.status not in status:
+            if r.code not in status:
                 if msg is None:
-                    msg = 'Status (%s) not in %s' % (self.status, str(status))
+                    msg = 'Status (%s) not in %s' % (r.code, str(status))
                 raise self.failureException(msg)
 
-    def assertHeader(self, key, value=None, msg=None):
-        """Fail if (key, [value]) not in self.headers."""
+    def assertHeader(self, r, key, value=None, msg=None):
+        """Fail if (key, [value]) not in r.headers."""
         lowkey = key.lower()
-        for k, v in self.headers.items():
+        for k, v in r.headers.items():
             if k.lower() == lowkey:
                 if value is None or str(value) == v:
@@ -220 +228 @@
         raise self.failureException(msg)
 
-    def assertNoHeader(self, key, msg=None):
-        """Fail if key in self.headers."""
+    def assertNoHeader(self, r, key, msg=None):
+        """Fail if key in r.headers."""
         lowkey = key.lower()
-        matches = [k for k, v in self.headers if k.lower() == lowkey]
+        matches = [k for k, v in r.headers if k.lower() == lowkey]
         if matches:
             if msg is None:
@@ -229 +237 @@
             raise self.failureException(msg)
     
-    def assertBody(self, value, msg=None):
-        """Fail if value != self.body."""
-        if value != self.body:
-            if msg is None:
-                msg = 'expected body:\n"%s"\n\nactual body:\n"%s"' % (value, self.body)
-            raise self.failureException(msg)
-
-    def assertInBody(self, value, msg=None):
-        """Fail if value not in self.body."""
-        if value not in self.body:
+    def assertBody(self, r, value, msg=None):
+        """Fail if value != r.body."""
+        if value.strip() != r.body.strip():
+            if msg is None:
+                msg = 'expected body:\n"%s"\n\nactual body:\n"%s"' % (value, r.body)
+            raise self.failureException(msg)
+
+    def assertInBody(self, r, value, msg=None):
+        """Fail if value not in r.body."""
+        if value not in r.body:
             if msg is None:
                 msg = '%s not in body' % value
             raise self.failureException(msg)
 
-    def assertNotInBody(self, value, msg=None):
-        """Fail if value in self.body."""
-        if value in self.body:
+    def assertNotInBody(self, r, value, msg=None):
+        """Fail if value in r.body."""
+        if value in r.body:
             if msg is None:
                 msg = '%s found in body' % value
             raise self.failureException(msg)
     
-    def assertMatchesBody(self, pattern, msg=None, flags=0):
-        """Fail if value (a regex pattern) is not in self.body."""
-        if re.search(pattern, self.body, flags) is None:
+    def assertMatchesBody(self, r, pattern, msg=None, flags=0):
+        """Fail if value (a regex pattern) is not in r.body."""
+        if re.search(pattern, r.body, flags) is None:
             if msg is None:
                 msg = 'No match for %s in body' % pattern
             raise self.failureException(msg)
 
-    def put_rejected(self, application, resource):
-        self.delete_resource(application)
-        self.assertStatus([200, 404])
-
-        r = self.put_resource(application, resource)
-        self.assertStatus(409)
-
-        # the document shouldn't be there
-        self.get_resource(application)
-        self.assertStatus(404)
-
-        self.status, self.headers, self.body = r.code, r.headers, r.body
+    def get(self, application, node=None, headers={}, status=200, client=None):
+        client = client or self.client
+        r = client.get(application, node, headers)
+        self.assertStatus(r, status)
         return r
 
-    def getputdelete_successful(self, application, document, content_type):
-        self.delete_resource(application)
-        self.assertStatus([200, 404])
-
-        self.get_resource(application)
-        self.assertStatus(404)
-
-        self.put_resource(application, document)
-        self.assertStatus(201)
-
-        self.get_resource(application)
-        self.assertStatus(200)
-        self.assertBody(document)
-        self.assertHeader('Content-Type', content_type)
-
-        self.put_resource(application, document)
-        self.assertStatus(200)
-
-        self.delete_resource(application)
-        self.assertStatus(200)
-
-        self.delete_resource(application)
-        self.assertStatus(404)
+    def put(self, application, resource, node=None, headers={},
+            status=[200,201], content_type_in_GET=None, client=None):
+        client = client or self.client
+        r_put = client.put(application, resource, node, headers)
+        self.assertStatus(r_put, status)
+
+        # if PUTting succeed, check that document is there and equals to resource
+        if r_put.succeed:
+            r_get = client.get(application, node)
+            self.assertStatus(r_get, 200,
+                              'although PUT succeed, following GET on the same URI did not: %s %s' % \
+                              (r_get.code, r_get.msg))
+            self.assertEqual(resource, r_get.body) # is body put equals to body got?
+            if content_type_in_GET is not None:
+                self.assertHeader(r_get, 'content-type', content_type_in_GET)
+
+        return r_put
+
+    def delete(self, application, node=None, headers={}, status=200, client=None):
+        client = client or self.client
+        r = client.delete(application, node, headers)
+        self.assertStatus(r, status)
+
+        # if deleting succeed, GET should return 404
+        if r.succeed or r.code == 404:
+            r_get = client.get(application, node, headers)
+            self.assertStatus(r_get, 404,
+                              'although DELETE succeed, following GET on the same URI did not return 404: %s %s' % \
+                              (r_get.code, r_get.msg))
+
+        return r
+
+    def put_rejected(self, application, resource, status=409, client=None):
+        """DELETE the document, then PUT it and expect 409 error. Return PUT result.
+        If PUT has indeed failed, also check that GET returns 404
+        """
+        self.delete(application, status=[200,404], client=client)
+        put_result = self.put(application, resource, status=status, client=client)
+        self.get(application, status=404, client=client)
+        return put_result
+
+    def getputdelete(self, application, document, content_type, client=None):
+        self.delete(application, status=[200,404], client=client)
+        self.get(application, status=404, client=client)
+        self.put(application, document, status=201, content_type_in_GET=content_type, client=client)
+        self.put(application, document, status=200, content_type_in_GET=content_type, client=client)
+        self.put(application, document, status=200, content_type_in_GET=content_type, client=client)
+        self.delete(application, status=200, client=client)
+        self.delete(application, status=404, client=client)
 
 

xcap/test/test_attribute.py

@@ -39 +39 @@
     
     def test_get(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
+        self.put('resource-lists', resource_list_xml)
         
-        self.get_resource('resource-lists', '/resource-lists/list[@name="other"]/@some-attribute')
-        self.assertStatus(404)
+        self.get('resource-lists', '/resource-lists/list[@name="other"]/@some-attribute', status=404)
                 
-        self.get_resource('resource-lists', '/resource-lists/list[@name="friends"]/@name')
-        self.assertStatus(200)
-        self.assertBody("friends")
-        self.assertHeader('ETag')
-        self.assertHeader('Content-type', 'application/xcap-att+xml')
+        r = self.get('resource-lists', '/resource-lists/list[@name="friends"]/@name')
+        self.assertBody(r, "friends")
+        self.assertHeader(r, 'ETag')
+        self.assertHeader(r, 'Content-type', 'application/xcap-att+xml')
 
     def test_delete(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
-        
-        self.delete_resource('resource-lists', '/resource-lists/list[@name="other"]/@some-attribute')
-        self.assertStatus(404)
+        self.put('resource-lists', resource_list_xml)
+        self.delete('resource-lists', '/resource-lists/list[@name="other"]/@some-attribute', status=404)
 
-        self.delete_resource('resource-lists', '/resource-lists/list[@name="friends"]/@name')
-        self.assertStatus(200)
-
-        self.delete_resource('resource-lists', '/resource-lists/list[@name="friends"]/@name')
-        self.assertStatus(404)
+        self.delete('resource-lists', '/resource-lists/list[@name="friends"]/@name', status=200)
+        self.delete('resource-lists', '/resource-lists/list[@name="friends"]/@name', status=404)
 
     def test_put(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
+        self.put('resource-lists', resource_list_xml)
 
         headers = {'Content-type': "application/xcap-att+xml"}
-        self.put_resource('resource-lists', 'coworkers', '/resource-lists/list[@name="other"]/@some-attribute', headers)
-        self.assertStatus(409)
+        self.put('resource-lists', 'coworkers',
+                 '/resource-lists/list[@name="other"]/@some-attribute', headers, status=409)
 
-        headers = {'Content-type': "application/xcap-att+xml"}
-        self.put_resource('resource-lists', 'coworkers', '/resource-lists/list[@name="friends"]/@name', headers)
-        self.assertStatus(200)
+        # fails GET(PUT(x))==x test. REJECT in the server?
+        ##self.put('resource-lists', 'coworkers', '/resource-lists/list[@name="friends"]/@name', headers)
+
+        r = self.client.put('resource-lists', 'coworkers', '/resource-lists/list[@name="friends"]/@name', headers)
+        self.assertStatus(r, 200)
 
 if __name__ == '__main__':

xcap/test/test_auth.py

@@ -10 +10 @@
     
     def test_authorization(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
-        
-        self.get_resource('resource-lists')
-        self.assertStatus(200)
-        
-        self.get_resource('dummy-application')
-        self.assertStatus(404)
+        self.put('resource-lists', resource_list_xml)
+        self.get('dummy-application', status=404)
         
         ### the request cannot be authenticated
         #password = self.account
-        #self.password += "dummy"
-        #self.get_resource('resource-lists')
-        #self.assertStatus(401)
-        #self.password = password
+        #self.client.password += "dummy"
+        #self.get('resource-lists', status=401)
+        #self.client.password = password
         
         ### the request cannot be authorized (we're trying to access someone else' resource)
         #account = self.account
         #self.account = "dummy" + self.account
-        #self.get_resource('resource-lists')
-        #self.assertStatus(401)
-        #self.account = account
+        #r = self.get('resource-lists', status=401)
+        #self.client.account = account
 
 if __name__ == '__main__':

xcap/test/test_element.py

@@ -39 +39 @@
     
     def test_get(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
+        self.delete('resource-lists', status=[200,404])
+        self.put('resource-lists', resource_list_xml)
+        self.get('resource-lists', '/resource-lists/list[@name="other"]', status=404)
+        self.get('resource-lists', '/resource-lists/list/entry[4]', status=404)
+        r = self.get('resource-lists', '/resource-lists/list[@name="friends"]')
+        self.assertBody(r, list_element_xml)
+        self.assertHeader(r, 'ETag')
+        self.assertHeader(r, 'Content-type', 'application/xcap-el+xml')
         
-        self.get_resource('resource-lists', '/resource-lists/list[@name="other"]')
-        self.assertStatus(404)
+        r = self.get('resource-lists', '/resource-lists/list[@name="friends"]/entry[2]')
+        self.assertBody(r, second_element_xml)
+        self.assertHeader(r, 'ETag')
+        self.assertHeader(r, 'Content-type', 'application/xcap-el+xml')
         
-        self.get_resource('resource-lists', '/resource-lists/list/entry[4]')
-        self.assertStatus(404)
-        
-        self.get_resource('resource-lists', '/resource-lists/list[@name="friends"]')
-        self.assertStatus(200)
-        self.assertInBody(list_element_xml)
-        #self.assertBody(list_element_xml)
-        self.assertHeader('ETag')
-        self.assertHeader('Content-type', 'application/xcap-el+xml')
-        
-        self.get_resource('resource-lists', '/resource-lists/list[@name="friends"]/entry[2]')
-        self.assertStatus(200)
-        self.assertInBody(second_element_xml)
-        #self.assertBody(second_element_xml)
-        self.assertHeader('ETag')
-        self.assertHeader('Content-type', 'application/xcap-el+xml')
-        
-        self.get_resource('resource-lists', '/resource-lists/list[@name="friends"]/*[2]')
-        self.assertStatus(200)
-        self.assertInBody(second_element_xml)
-        #self.assertBody(second_element_xml)
-        self.assertHeader('ETag')
-        self.assertHeader('Content-type', 'application/xcap-el+xml')
+        r = self.get('resource-lists', '/resource-lists/list[@name="friends"]/*[2]')
+        self.assertStatus(r, 200)
+        self.assertBody(r, second_element_xml)
+        self.assertHeader(r, 'ETag')
+        self.assertHeader(r, 'Content-type', 'application/xcap-el+xml')
 
     def test_delete(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
+        self.put('resource-lists', resource_list_xml)
         
-        self.delete_resource('resource-lists', '/resource-lists/list[@name="friends"]/*[3]')
-        self.assertStatus(200)
-        self.assertHeader('ETag')
+        r = self.delete('resource-lists', '/resource-lists/list[@name="friends"]/*[3]')
+        self.assertHeader(r, 'ETag')
 
-        self.delete_resource('resource-lists', '/resource-lists/list[@name="friends"]/*[2]')
-        self.assertStatus(200)
-        self.assertHeader('ETag')
+        r = self.delete('resource-lists', '/resource-lists/list[@name="friends"]/*[2]')
+        self.assertHeader(r, 'ETag')
 
-        self.delete_resource('resource-lists', '/resource-lists/list[@name="friends"]/*[1]')
-        self.assertStatus(200)
-        self.assertHeader('ETag')
+        r = self.delete('resource-lists', '/resource-lists/list[@name="friends"]/*[1]')
+        self.assertHeader(r, 'ETag')
 
-        self.delete_resource('resource-lists', '/resource-lists/list[@name="friends"]/entry[@uri="sip:joe@example.com"]')
-        self.assertStatus(404)
+        self.delete('resource-lists',
+                    '/resource-lists/list[@name="friends"]/entry[@uri="sip:joe@example.com"]', status=404)
 
-    def test_put(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
-        
-        self.put_resource('resource-lists', second_element_xml, '/resource-lists/list[@name="friends"]')
-        self.assertStatus(415)        ## content type not set
+    def test_put_error(self):
+        self.put('resource-lists', resource_list_xml)
+
+        # 415 content type not set
+        self.put('resource-lists', second_element_xml, '/resource-lists/list[@name="friends"]', status=415)
 
         headers = {'Content-type': "application/xcap-el+xml"}
-        self.put_resource('resource-lists', broken_element_xml, '/resource-lists/list[@name="friends"]', headers)
-        self.assertStatus(409)        ## <not-xml-frag>
-        
-        self.put_resource('resource-lists', second_element_xml, '/resource-lists/list[@name="others"]/entry[2]', headers)
-        self.assertStatus(409)        ## <not-parent>
-        
-        self.put_resource('resource-lists', second_element_xml, '/resource-lists/list[@name="friends"]/entry[1]', headers)
-        self.assertStatus(409)        ## <uniqueness-failure>
+        # 409 <not-xml-frag>
+        r = self.put('resource-lists', broken_element_xml, '/resource-lists/list[@name="friends"]',
+                     headers, status=409)
+
+        # 409 <not-parent>
+        r = self.put('resource-lists', second_element_xml, '/resource-lists/list[@name="others"]/entry[2]',
+                     headers, status=409)
+
+        # 409 <uniqueness-failure>
+        r = self.put('resource-lists', second_element_xml, '/resource-lists/list[@name="friends"]/entry[1]',
+                     headers, status=409)
 
 if __name__ == '__main__':

xcap/test/test_etags.py

@@ -10 +10 @@
 
     def test_conditional_GET(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
-        etag = self.assertHeader('ETag')
+        r = self.put('resource-lists', resource_list_xml)
+        etag = self.assertHeader(r, 'ETag')
         
         # Test If-Match (both valid and invalid)
-        self.get_resource('resource-lists', headers={'If-Match': etag})
-        self.assertStatus(200)
-        self.get_resource('resource-lists', headers={'If-Match': '*'})
-        self.assertStatus(200)
-        self.get_resource('resource-lists', headers={'if-Match': "another-etag"})
-        self.assertStatus(412)
+        self.get('resource-lists', headers={'If-Match': etag})
+        self.get('resource-lists', headers={'If-Match': '*'})
+        self.get('resource-lists', headers={'if-Match': "another-etag"}, status=412)
         
         # Test If-None-Match (both valid and invalid)
-        self.get_resource('resource-lists', headers={'If-None-Match': etag})
-        self.assertStatus(304)
-        self.get_resource('resource-lists', headers={'If-None-Match': '*'})
-        self.assertStatus(304)
-        self.get_resource('resource-lists', headers={'If-None-Match': "another-etag"})
-        self.assertStatus(200)
+        self.get('resource-lists', headers={'If-None-Match': etag}, status=304)
+        self.get('resource-lists', headers={'If-None-Match': '*'}, status=304)
+        self.get('resource-lists', headers={'If-None-Match': "another-etag"}, status=200)
         
     def test_conditional_PUT(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
-        etag = self.assertHeader('ETag')        
+        r = self.put('resource-lists', resource_list_xml)
+        etag = self.assertHeader(r, 'ETag')        
         
         # Test conditional PUT logic
         ## Alice and Bob initially share the same etag
         alice_etag = bob_etag = etag
+
         ## Bob modifies the resource
-        self.put_resource('resource-lists', resource_list_xml, headers={'If-Match': bob_etag})
-        self.assertStatus([200, 201])
-        bob_etag = self.assertHeader('ETag')
+        r = self.put('resource-lists', resource_list_xml, headers={'If-Match': bob_etag})
+        bob_etag = self.assertHeader(r, 'ETag')
         
         ## now Alice tries to modify the resource
-        self.put_resource('resource-lists', resource_list_xml, headers={'If-Match': alice_etag})
-        self.assertStatus(412)
+        self.put('resource-lists', resource_list_xml, headers={'If-Match': alice_etag}, status=412)
         
         ## the etag has changed so now she updates her in-memory document
-        self.get_resource('resource-lists')
-        self.assertStatus(200)
-        alice_etag = self.assertHeader('ETag')
+        r = self.get('resource-lists')
+        new_alice_etag = self.assertHeader(r, 'ETag')
+        self.assertEqual(bob_etag, new_alice_etag)
         
-        self.put_resource('resource-lists', resource_list_xml, headers={'If-Match': alice_etag})
-        self.assertStatus([200, 201])
+        self.put('resource-lists', resource_list_xml, headers={'If-Match': new_alice_etag})
 
 if __name__ == '__main__':

xcap/test/test_nsbindings.py

@@ -19 +19 @@
 
     def test_ns_bindings(self):
-        self.put_resource('resource-lists', resource_list_xml)
-        self.assertStatus([200, 201])
-
-        self.get_resource('resource-lists', '/resource-lists/list[@name="friends"]/namespace::*')
-        self.assertStatus(200)
-        self.assertHeader('ETag')
-        self.assertHeader('Content-type', 'application/xcap-ns+xml')
+        self.put('resource-lists', resource_list_xml)
+        r = self.get('resource-lists', '/resource-lists/list[@name="friends"]/namespace::*')
+        self.assertHeader(r, 'ETag')
+        self.assertHeader(r, 'Content-type', 'application/xcap-ns+xml')
 
 if __name__ == '__main__':

xcap/test/test_pidf.py

@@ -21 +21 @@
 
     def test_pidf_manipulation(self):
-        self.delete_resource('pidf-manipulation')
-        self.assertStatus([200, 404])
-
-        self.get_resource('pidf-manipulation')
-        self.assertStatus(404)
-
-        self.put_resource('pidf-manipulation', pidf_xml)
-        self.assertStatus(201)
-
-        self.get_resource('pidf-manipulation')
-        self.assertStatus(200)
-        self.assertBody(pidf_xml)
-        self.assertHeader('Content-type', 'application/pidf+xml')
-
-        self.put_resource('pidf-manipulation', pidf_xml)
-        self.assertStatus(200)
-
-        self.delete_resource('pidf-manipulation')
-        self.assertStatus(200)
-
-        self.delete_resource('pidf-manipulation')
-        self.assertStatus(404)
+        self.getputdelete('pidf-manipulation', pidf_xml, 'application/pidf+xml')
 
 if __name__ == '__main__':

xcap/test/test_presrules.py

@@ -32 +32 @@
 
     def test_pidf_manipulation(self):
-        self.delete_resource('pres-rules')
-        self.assertStatus([200, 404])
-
-        self.put_resource('pres-rules', pres_rules_xml)
-        self.assertStatus(201)
-
-        self.get_resource('pres-rules')
-        self.assertStatus(200)
-        self.assertBody(pres_rules_xml)
-        self.assertHeader('Content-type', 'application/auth-policy+xml')
+        self.getputdelete('pres-rules', pres_rules_xml, 'application/auth-policy+xml')
 
 if __name__ == '__main__':

xcap/test/test_resourcelists.py

@@ -99 +99 @@
   
     def test_operations(self):
-        self.getputdelete_successful('resource-lists', resource_lists_xml, 'application/resource-lists+xml')