Clean up unit test suite; Remove print statements;

barbican/api/middleware/__init__.py

@@ -17,6 +17,9 @@
 Barbican middleware modules.
 """
 import webob.dec
+from barbican.common import utils
+
+LOG = utils.getLogger(__name__)
 
 
 class Middleware(object):
@@ -70,16 +73,16 @@ class Debug(Middleware):
 
     @webob.dec.wsgify
     def __call__(self, req):
-        print ("*" * 40) + " REQUEST ENVIRON"
+        LOG.debug(("*" * 40) + " REQUEST ENVIRON")
         for key, value in req.environ.items():
-            print key, "=", value
-        print
+            LOG.debug('{0}={1}'.format(key, value))
+        LOG.debug(' ')
         resp = req.get_response(self.application)
 
-        print ("*" * 40) + " RESPONSE HEADERS"
+        LOG.debug(("*" * 40) + " RESPONSE HEADERS")
         for (key, value) in resp.headers.iteritems():
-            print key, "=", value
-        print
+            LOG.debug('{0}={1}'.format(key, value))
+        LOG.debug(' ')
 
         resp.app_iter = self.print_generator(resp.app_iter)
 
@@ -91,9 +94,9 @@ class Debug(Middleware):
         Iterator that prints the contents of a wrapper string iterator
         when iterated.
         """
-        print ("*" * 40) + " BODY"
+        LOG.debug(("*" * 40) + " BODY")
         for part in app_iter:
             sys.stdout.write(part)
             sys.stdout.flush()
             yield part
-        print
+        LOG.debug(' ')

barbican/tests/api/resources_test.py

@@ -33,8 +33,10 @@ def suite():
 
     suite.addTest(WhenTestingVersionResource())
     suite.addTest(WhenCreatingSecretsUsingSecretsResource())
-    suite.addTest(WhenGettingOrDeletingSecretUsingSecretResource())
+    suite.addTest(WhenGettingSecretsListUsingSecretsResource())
+    suite.addTest(WhenGettingPuttingOrDeletingSecretUsingSecretResource())
     suite.addTest(WhenCreatingOrdersUsingOrdersResource())
+    suite.addText(WhenGettingOrdersListUsingOrdersResource())
     suite.addTest(WhenGettingOrDeletingOrderUsingOrderResource())
 
     return suite
@@ -175,6 +177,20 @@ class WhenCreatingSecretsUsingSecretsResource(unittest.TestCase):
         self.assertEqual(self.mime_type, datum.mime_type)
         self.assertIsNotNone(datum.kek_metadata)
 
+    def test_should_add_new_secret_with_expiration(self):
+        expiration = '2114-02-28 12:14:44.180394-05:00'
+        self.secret_req.update({'expiration': expiration})
+        self.stream.read.return_value = json.dumps(self.secret_req)        
+        
+        self.resource.on_post(self.req, self.resp, self.keystone_id)
+
+        self.assertEquals(self.resp.status, falcon.HTTP_201)
+
+        args, kwargs = self.secret_repo.create_from.call_args
+        secret = args[0]
+        expected = expiration[:-6].replace('12', '17', 1)
+        self.assertEqual(expected, str(secret.expiration))
+
     def test_should_add_new_secret_tenant_not_exist(self):
         self.tenant_repo.get.return_value = None