You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2018/01/08 11:30:29 UTC

[2/2] libcloud git commit: Fix a test case race.

Fix a test case race.


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/81fb465f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/81fb465f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/81fb465f

Branch: refs/heads/trunk
Commit: 81fb465f90a939351d6fbba7e1f3447d1bfa60c9
Parents: 187eef2
Author: Tomaz Muraus <to...@tomaz.me>
Authored: Mon Jan 8 12:26:41 2018 +0100
Committer: Tomaz Muraus <to...@tomaz.me>
Committed: Mon Jan 8 12:26:41 2018 +0100

----------------------------------------------------------------------
 libcloud/test/storage/test_base.py           | 4 ++--
 libcloud/test/storage/test_google_storage.py | 2 +-
 libcloud/test/storage/test_s3.py             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/81fb465f/libcloud/test/storage/test_base.py
----------------------------------------------------------------------
diff --git a/libcloud/test/storage/test_base.py b/libcloud/test/storage/test_base.py
index f957742..cbcafc5 100644
--- a/libcloud/test/storage/test_base.py
+++ b/libcloud/test/storage/test_base.py
@@ -157,7 +157,7 @@ class BaseStorageTests(unittest.TestCase):
         self.assertEqual(mock_read_in_chunks.call_count, 0)
         self.assertEqual(mock_exhaust_iterator.call_count, 0)
 
-        result = self.driver1._upload_object(object_name='test',
+        result = self.driver1._upload_object(object_name='test1',
                                              content_type=None,
                                              upload_func=upload_func,
                                              upload_func_kwargs={},
@@ -188,7 +188,7 @@ class BaseStorageTests(unittest.TestCase):
         self.assertEqual(mock_read_in_chunks.call_count, 1)
         self.assertEqual(mock_exhaust_iterator.call_count, 0)
 
-        result = self.driver1._upload_object(object_name='test',
+        result = self.driver1._upload_object(object_name='test2',
                                              content_type=None,
                                              upload_func=upload_func,
                                              upload_func_kwargs={},

http://git-wip-us.apache.org/repos/asf/libcloud/blob/81fb465f/libcloud/test/storage/test_google_storage.py
----------------------------------------------------------------------
diff --git a/libcloud/test/storage/test_google_storage.py b/libcloud/test/storage/test_google_storage.py
index da03b2b..9203074 100644
--- a/libcloud/test/storage/test_google_storage.py
+++ b/libcloud/test/storage/test_google_storage.py
@@ -519,7 +519,7 @@ class GoogleStorageTests(S3Tests, GoogleTestCase):
         destination_path = os.path.abspath(__file__) + '.temp'
         result = self.driver.download_object(obj=obj,
                                              destination_path=destination_path,
-                                             overwrite_existing=False,
+                                             overwrite_existing=True,
                                              delete_on_failure=True)
         self.assertTrue(result)
 

http://git-wip-us.apache.org/repos/asf/libcloud/blob/81fb465f/libcloud/test/storage/test_s3.py
----------------------------------------------------------------------
diff --git a/libcloud/test/storage/test_s3.py b/libcloud/test/storage/test_s3.py
index acb44a6..adc69a3 100644
--- a/libcloud/test/storage/test_s3.py
+++ b/libcloud/test/storage/test_s3.py
@@ -628,7 +628,7 @@ class S3Tests(unittest.TestCase):
         destination_path = os.path.abspath(__file__) + '.temp'
         result = self.driver.download_object(obj=obj,
                                              destination_path=destination_path,
-                                             overwrite_existing=False,
+                                             overwrite_existing=True,
                                              delete_on_failure=True)
         self.assertTrue(result)