Merge branch 'master' of github.com:gvlproject/cloudbridge

test/test_provider_factory.py

@@ -1,8 +1,10 @@
 import unittest
+
 from cloudbridge.providers import factory
 from cloudbridge.providers import interfaces
+from cloudbridge.providers.aws import AWSCloudProviderV1
 from cloudbridge.providers.factory import CloudProviderFactory
-import helpers
+import test.helpers as helpers
 
 
 class ProviderFactoryTestCase(unittest.TestCase):
@@ -82,3 +84,25 @@ class ProviderFactoryTestCase(unittest.TestCase):
                     mock,
                     helpers.TestMockHelperMixin),
                 "Did not expect mock but class implements mock provider")
+
+    def test_get_provider_class_valid(self):
+        """
+        Searching for a provider class with a known name should return a valid
+        class
+        """
+        self.assertTrue(
+            CloudProviderFactory().get_provider_class(
+                factory.ProviderList.AWS))
+        self.assertEqual(CloudProviderFactory().get_provider_class(
+            factory.ProviderList.AWS, version=1),
+            AWSCloudProviderV1)
+
+    def test_get_provider_class_invalid(self):
+        """
+        Searching for a provider class with an invalid name or version should
+        return None
+        """
+        self.assertIsNone(CloudProviderFactory().get_provider_class("aws1"))
+        self.assertIsNone(CloudProviderFactory().get_provider_class(
+            factory.ProviderList.AWS,
+            version=100))

test/test_provider_object_store_service.py

@@ -100,6 +100,6 @@ class ProviderObjectStoreServiceTestCase(ProviderTestBase):
                 obj.upload(content)
                 target_stream = BytesIO()
                 obj.download(target_stream)
-                self.assertEqual(target_stream.getvalue(), content)
+                self.assertEqual(str(target_stream.getvalue()), content)
                 obj.delete()
             test_container.delete()