Test updates

Author: gmr

consulate/utils.py

@@ -40,27 +40,23 @@ def maybe_encode(value):
         return value
 
 
-def response_ok(response, raise_on_404=True):
+def _response_error(response):
+    return (response.body.decode('utf-8')
+            if hasattr(response, 'body') and response.body
+            else str(response.status_code))
+
+
+def response_ok(response, raise_on_404=False):
     if response.status_code == 200:
         return True
     elif response.status_code == 400:
-        raise exceptions.ClientError(
-            response.body.decode('utf-8')
-            if hasattr(response, 'body') else str(response.status_code))
+        raise exceptions.ClientError(_response_error(response))
     elif response.status_code == 401:
-        raise exceptions.ACLDisabled(
-            response.body.decode('utf-8')
-            if hasattr(response, 'body') else str(response.status_code))
+        raise exceptions.ACLDisabled(_response_error(response))
     elif response.status_code == 403:
-        raise exceptions.Forbidden(
-            response.body.decode('utf-8')
-            if hasattr(response, 'body') else str(response.status_code))
+        raise exceptions.Forbidden(_response_error(response))
     elif response.status_code == 404 and raise_on_404:
-        raise exceptions.NotFound(
-            response.body.decode('utf-8')
-            if hasattr(response, 'body') else str(response.status_code))
+        raise exceptions.NotFound(_response_error(response))
     elif response.status_code == 500:
-        raise exceptions.ServerError(
-            response.body.decode('utf-8')
-            if hasattr(response, 'body') else str(response.status_code))
+        raise exceptions.ServerError(_response_error(response))
     return False

tests/api-tests.py tests/api_tests.pytests/api-tests.py renamed to tests/api_tests.py

@@ -0,0 +1,11 @@
+from . import base
+
+
+class TestCatalog(base.TestCase):
+    def test_catalog_registration(self):
+        self.consul.catalog.register('test-service', address='10.0.0.1')
+        self.assertIn('test-service',
+                      [n['Node'] for n in self.consul.catalog.nodes()])
+        self.consul.catalog.deregister('test-service')
+        self.assertNotIn('test-service',
+                         [n['Node'] for n in self.consul.catalog.nodes()])

tests/catalog_tests.py

@@ -0,0 +1,18 @@
+import uuid
+
+from . import base
+
+
+class TestEvent(base.TestCase):
+    def test_fire(self):
+        event_name = 'test-event-%s' % str(uuid.uuid4())[0:8]
+        response = self.consul.event.fire(event_name)
+        events = self.consul.event.list(event_name)
+        if isinstance(events, dict):
+            self.assertEqual(event_name, events.get('Name'))
+            self.assertEqual(response, events.get('ID'))
+        elif isinstance(events, dict):
+            self.assertIn(event_name, [e.get('Name') for e in events])
+            self.assertIn(response, [e.get('ID') for e in events])
+        else:
+            assert False, 'Unexpected return type'