add ut for init

oss2/__init__.py

@@ -30,7 +30,6 @@
 from .crypto import LocalRsaProvider, AliKMSProvider
 import logging
 
-logging.basicConfig(level=logging.INFO, format='%(asctime)s %(name)s [%(levelname)s] %(thread)d : %(message)s')
 logger = logging.getLogger('oss2')
 
 
@@ -58,3 +57,6 @@ def set_stream_logger(name='oss2', level=logging.DEBUG, format_string=None):
     formatter = logging.Formatter(format_string)
     fh.setFormatter(formatter)
     logger.addHandler(fh)
+
+
+set_stream_logger('oss2', logging.INFO)

unittests/test_crc64_combine.py

@@ -80,5 +80,6 @@ def test_crc64_combine_str2_empty(self):
 
         self.assertEqual(crc_combine, crc_raw)
 
+
 if __name__ == '__main__':
     unittest.main()

unittests/test_headers.py

@@ -6,12 +6,16 @@
 
 
 class TestHeaders(unittest.TestCase):
-    def test_check_RequestHeader(self):
+    def test_check_requestHeader(self):
         myHeader = RequestHeader()
 
         myHeader.set_server_side_encryption(algorithm="AES256")
         self.assertTrue(myHeader["x-oss-server-side-encryption"] is "AES256")
 
+        myHeader.set_server_side_encryption(algorithm='KMS')
+        self.assertTrue(myHeader["x-oss-server-side-encryption"] is "KMS")
+        self.assertTrue("x-oss-server-side-encryption-key-id" not in myHeader)
+
         myHeader.set_server_side_encryption(algorithm="KMS", cmk_id="1111")
         self.assertTrue(myHeader["x-oss-server-side-encryption"] is "KMS")
         self.assertTrue(myHeader["x-oss-server-side-encryption-key-id"] is "1111")
@@ -20,3 +24,6 @@ def test_check_RequestHeader(self):
         self.assertTrue("x-oss-server-side-encryption" not in myHeader)
         self.assertTrue("x-oss-server-side-encryption-key-id" not in myHeader)
 
+
+if __name__ == '__main__':
+    unittest.main()

unittests/test_init.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+import oss2
+import logging
+from unittests.common import *
+
+
+class TestInit(OssTestCase):
+
+    def test_set_logger(self):
+        oss2.set_stream_logger('oss2', logging.DEBUG)
+        self.assertTrue(oss2.logger.name, 'oss2')
+        self.assertTrue(oss2.logger.level, logging.DEBUG)
+
+        log_file_path = self.tempname()
+        oss2.set_file_logger(log_file_path, 'oss2', logging.INFO)
+        self.assertTrue(oss2.logger.name, 'oss2')
+        self.assertTrue(oss2.logger.level, logging.INFO)
+        oss2.logger.info("hello, oss2")
+
+        with open(log_file_path,'rb') as f:
+            self.assertTrue("hello, oss2" in oss2.to_string(f.read()))
+
+
+if __name__ == '__main__':
+    unittest.main()

unittests/test_iterator.py

@@ -467,4 +467,8 @@ def test_object_upload_iterator_default_max_retries(self):
         self.assertEqual(iter.max_retries, 100)
 
         iter = oss2.ObjectUploadIterator(bucket(), 'fake-key', max_retries=1)
-        self.assertEqual(iter.max_retries, 1)
+        self.assertEqual(iter.max_retries, 1)
+
+
+if __name__ == '__main__':
+    unittest.main()

unittests/test_multipart.py

@@ -184,3 +184,7 @@ def test_abort(self, do_request):
 
         self.assertRequest(req_info, request_text)
 
+
+if __name__ == '__main__':
+    unittest.main()
+

unittests/test_resumable.py

@@ -17,3 +17,7 @@ def test_determine_part_size(self):
 
         self.assertTrue(n * part_size <= size)
         self.assertTrue(oss2.defaults.part_size < part_size)
+
+
+if __name__ == '__main__':
+    unittest.main()

unittests/test_task_queue.py

@@ -105,3 +105,5 @@ def consumer(q):
         self.assertRaises(RuntimeError, q.run)
 
 
+if __name__ == '__main__':
+    unittest.main()