Quellcode durchsuchen

Verbose testing and generate_url change

almahmoud vor 7 Jahren
Ursprung
Commit
a322011bf2

+ 1 - 1
.travis.yml

@@ -262,7 +262,7 @@ install:
     - pip install coveralls
     - pip install codecov
 script:
-    - travis_wait 50 tox -e $TOX_ENV -- --tests $TOX_TEST
+    - tox -e $TOX_ENV -- -s -v --tests $TOX_TEST
 after_script:
     - |
       case "$TRAVIS_EVENT_TYPE" in

+ 1 - 1
cloudbridge/cloud/interfaces/resources.py

@@ -2187,7 +2187,7 @@ class BucketObject(CloudResource):
         pass
 
     @abstractmethod
-    def generate_url(self, expires_in=0):
+    def generate_url(self, expires_in=3600):
         """
         Generate a URL to this object.
 

+ 2 - 1
cloudbridge/cloud/providers/aws/resources.py

@@ -785,7 +785,8 @@ class AWSBucketObject(BaseBucketObject):
     def delete(self):
         self._obj.delete()
 
-    def generate_url(self, expires_in=0):
+    def generate_url(self, expires_in):
+
         return self._provider.s3_conn.meta.client.generate_presigned_url(
             'get_object',
             Params={'Bucket': self._obj.bucket_name, 'Key': self.id},

+ 1 - 1
cloudbridge/cloud/providers/azure/resources.py

@@ -307,7 +307,7 @@ class AzureBucketObject(BaseBucketObject):
         self._provider.azure_client.delete_blob(self._container.name,
                                                 self.name)
 
-    def generate_url(self, expires_in=3600):
+    def generate_url(self, expires_in):
         """
         Generate a URL to this object.
         """

+ 1 - 1
cloudbridge/cloud/providers/openstack/resources.py

@@ -1392,7 +1392,7 @@ class OpenStackBucketObject(BaseBucketObject):
                 result = result and del_res['success']
         return result
 
-    def generate_url(self, expires_in=0):
+    def generate_url(self, expires_in):
         # Set a temp url key on the object (http://bit.ly/2NBiXGD)
         temp_url_key = "cloudbridge-tmp-url-key"
         self._provider.swift.post_account(