tests for get API calls

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>

diff --git a/radosgw_agent/tests/test_client.py b/radosgw_agent/tests/test_client.py
index b7626f972a8aaeb9d795da50931bb6b707a69226..f6646b8b3738c81721d8d5990ebe6080a2d1f06c 100644 (file)
--- a/radosgw_agent/tests/test_client.py
+++ b/radosgw_agent/tests/test_client.py
@@ -478,18 +478,10 @@ class TestBotoCall(object):
             foo()
 
 
-class TestRequest(object):
-
-    @httpretty.activate
-    def test_url(self):
+class TestGETClientRequests(object):
 
-        httpretty.register_uri(
-            httpretty.GET,
-            re.compile("http://localhost:8888/(.*)"),
-            body='{}',
-            content_type="application/json",
-        )
-        connection = client.S3Connection(
+    def setup(self):
+        self.connection = client.S3Connection(
             aws_access_key_id='key',
             aws_secret_access_key='secret',
             is_secure=False,
@@ -499,41 +491,43 @@ class TestRequest(object):
             debug=True,
         )
 
-        client.request(connection, 'get', '/%7E~')
-        server_request = httpretty.last_request()
-        assert server_request.path == '/%257E%7E'
-
-    @httpretty.activate
-    def test_url_response(self):
-
+    def register(self):
         httpretty.register_uri(
             httpretty.GET,
             re.compile("http://localhost:8888/(.*)"),
-            body='{"msg": "ok"}',
+            body='{}',
             content_type="application/json",
         )
-        connection = client.S3Connection(
-            aws_access_key_id='key',
-            aws_secret_access_key='secret',
-            is_secure=False,
-            host='localhost',
-            port=8888,
-            calling_format=client.boto.s3.connection.OrdinaryCallingFormat(),
-            debug=True,
-        )
 
-        result = client.request(connection, 'get', '/%7E~')
-        assert result == {'msg': 'ok'}
+    @httpretty.activate
+    def test_get_metadata(self):
+        self.register()
+        client.get_metadata(self.connection, 'metadata', 'foo')
+        server_request = httpretty.last_request()
+        assert server_request.path == '/admin/metadata/metadata?key=foo'
 
     @httpretty.activate
-    def test_url_bad(self):
+    def test_get_metadata_sections(self):
+        self.register()
+        client.get_metadata_sections(self.connection)
+        server_request = httpretty.last_request()
+        assert server_request.path == '/admin/metadata'
+
+    @httpretty.activate
+    def test_list_metadata_keys(self):
+        self.register()
+        client.list_metadata_keys(self.connection, 'foo')
+        server_request = httpretty.last_request()
+        assert server_request.path == '/admin/metadata/foo'
+
+    @httpretty.activate
+    def test_url_response(self):
 
         httpretty.register_uri(
             httpretty.GET,
             re.compile("http://localhost:8888/(.*)"),
-            body='{}',
+            body='{"msg": "ok"}',
             content_type="application/json",
-            status=500,
         )
         connection = client.S3Connection(
             aws_access_key_id='key',
@@ -545,5 +539,5 @@ class TestRequest(object):
             debug=True,
         )
 
-        with py.test.raises(client.HttpError):
-            client.request(connection, 'get', '/%7E~', _retries=0)
+        result = client.request(connection, 'get', '/%7E~')
+        assert result == {'msg': 'ok'}