test: fix test cases

Author: lihsai0

qiniu/http/regions_provider.py

@@ -524,7 +524,8 @@ def __iter__(self):
             self.__get_regions_from_base_provider
         ]
 
-        regions = []
+        # set the fallback to None for raise errors when failed
+        regions = None
         for get_regions in get_regions_fns:
             regions = get_regions(fallback=regions)
             if regions and all(r.is_live for r in regions):

tests/cases/test_http/test_regions_provider.py

@@ -275,7 +275,13 @@ def test_shrink_with_expired_regions(self, cached_regions_provider):
         origin_cache_key = cached_regions_provider.cache_key
         cached_regions_provider.set_regions([expired_region])
         cached_regions_provider.cache_key = 'another-cache-key'
-        list(cached_regions_provider)  # trigger __shrink_cache()
+
+        # trigger __shrink_cache()
+        cached_regions_provider._cache_scope = cached_regions_provider._cache_scope._replace(
+            last_shrink_at=datetime.datetime.fromtimestamp(0)
+        )
+        list(cached_regions_provider)
+
         assert len(cached_regions_provider._cache_scope.memo_cache[origin_cache_key]) == 0
 
     def test_shrink_with_ignore_expired_regions(self, cached_regions_provider):

tests/cases/test_zone/test_qiniu_conf.py

@@ -51,7 +51,7 @@ def test_config_compatible(self, set_conf_default):
         'set_conf_default',
         [
             {
-                'default_query_region_host': 'https://fake-uc.phpsdk.qiniu.com'
+                'default_query_region_host': 'https://fake-uc.pysdk.qiniu.com'
             }
         ],
         indirect=True
@@ -66,9 +66,9 @@ def test_query_region_with_custom_domain(self, access_key, bucket_name, set_conf
         'set_conf_default',
         [
             {
-                'default_query_region_host': 'https://fake-uc.phpsdk.qiniu.com',
+                'default_query_region_host': 'https://fake-uc.pysdk.qiniu.com',
                 'default_query_region_backup_hosts': [
-                    'unavailable-uc.phpsdk.qiniu.com',
+                    'unavailable-uc.pysdk.qiniu.com',
                     'uc.qbox.me'
                 ]
             }
@@ -78,13 +78,13 @@ def test_query_region_with_custom_domain(self, access_key, bucket_name, set_conf
     def test_query_region_with_backup_domains(self, access_key, bucket_name, set_conf_default):
         zone = Zone()
         data = zone.bucket_hosts(access_key, bucket_name)
-        assert data != 'null'
+        assert data != 'null' and len(data) > 0
 
     @pytest.mark.parametrize(
         'set_conf_default',
         [
             {
-                'default_uc_host': 'https://fake-uc.phpsdk.qiniu.com',
+                'default_uc_host': 'https://fake-uc.pysdk.qiniu.com',
                 'default_query_region_backup_hosts': [
                     'unavailable-uc.phpsdk.qiniu.com',
                     'uc.qbox.me'