revert some code

aliyun · Dec 14, 2017 · e57f2b7 · e57f2b7
1 parent 1d43476
commit e57f2b7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/tests/test_object.py b/tests/test_object.py
@@ -686,17 +686,17 @@ def __init__(self, *args, **kwargs):
         super(TestSign, self).__init__(*args, **kwargs)
 
     def setUp(self):
-        if os.getenv('OSS_TEST_SIGN_VERSION') == oss2.AUTH_VERSION_2:
-            os.environ['OSS_TEST_SIGN_VERSION'] = oss2.AUTH_VERSION_1
+        if os.getenv('OSS_TEST_AUTH_VERSION') == oss2.AUTH_VERSION_2:
+            os.environ['OSS_TEST_AUTH_VERSION'] = oss2.AUTH_VERSION_1
         else:
-            os.environ['OSS_TEST_SIGN_VERSION'] = oss2.AUTH_VERSION_2
+            os.environ['OSS_TEST_AUTH_VERSION'] = oss2.AUTH_VERSION_2
         super(TestSign, self).setUp()
 
     def tearDown(self):
-        if os.getenv('OSS_TEST_SIGN_VERSION') == oss2.AUTH_VERSION_2:
-            os.environ['OSS_TEST_SIGN_VERSION'] = oss2.AUTH_VERSION_1
+        if os.getenv('OSS_TEST_AUTH_VERSION') == oss2.AUTH_VERSION_2:
+            os.environ['OSS_TEST_AUTH_VERSION'] = oss2.AUTH_VERSION_1
         else:
-            os.environ['OSS_TEST_SIGN_VERSION'] = oss2.AUTH_VERSION_2
+            os.environ['OSS_TEST_AUTH_VERSION'] = oss2.AUTH_VERSION_2
         super(TestSign, self).tearDown()
 
 

diff --git a/tests/test_sts.py b/tests/test_sts.py
@@ -45,8 +45,10 @@ def fetch_sts_token(access_key_id, access_key_secret, role_arn):
 
     class TestSTSAuth(oss2.StsAuth):
         def __init__(self, access_key_id, access_key_secret, security_token):
-            super(TestSTSAuth, self).__init__(access_key_id, access_key_secret, security_token, os.getenv('OSS_TEST_AUTH_VERSION'))
-
+            super(TestSTSAuth, self).__init__(access_key_id,
+                                              access_key_secret,
+                                              security_token,
+                                              os.getenv('OSS_TEST_AUTH_VERSION'))
 
     oss2.StsAuth = TestSTSAuth
 
@@ -110,3 +112,24 @@ def test_rtmp(self):
 
             url = self.bucket.sign_rtmp_url(channel_name, 'test.m3u8', 3600)
             self.assertTrue('security-token=' in url)
+
+    class TestSign(TestSts):
+        """
+            这个类主要是用来增加测试覆盖率，当环境变量为oss2.AUTH_VERSION_2，则重新设置为oss2.AUTH_VERSION_1再运行TestSts，反之亦然
+        """
+        def __init__(self, *args, **kwargs):
+            super(TestSign, self).__init__(*args, **kwargs)
+
+        def setUp(self):
+            if os.getenv('OSS_TEST_AUTH_VERSION') == oss2.AUTH_VERSION_2:
+                os.environ['OSS_TEST_AUTH_VERSION'] = oss2.AUTH_VERSION_1
+            else:
+                os.environ['OSS_TEST_AUTH_VERSION'] = oss2.AUTH_VERSION_2
+            super(TestSign, self).setUp()
+
+        def tearDown(self):
+            if os.getenv('OSS_TEST_AUTH_VERSION') == oss2.AUTH_VERSION_2:
+                os.environ['OSS_TEST_AUTH_VERSION'] = oss2.AUTH_VERSION_1
+            else:
+                os.environ['OSS_TEST_AUTH_VERSION'] = oss2.AUTH_VERSION_2
+            super(TestSign, self).tearDown()