change the function name

Signed-off-by: hwangdeyu <[email protected]>

Author: hwangdeyu

tests/keras2onnx_applications/nightly_build/test_transformers.py

@@ -1,22 +1,22 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import os
+from os.path import dirname, abspath
 import sys
 import unittest
-import mock_keras2onnx
 import json
 import urllib.request
 import pickle
-from os.path import dirname, abspath
-from mock_keras2onnx.proto import keras
 import numpy as np
 import tensorflow as tf
+
 from onnxconverter_common.onnx_ex import get_maximum_opset_supported
-from test_utils import check_bloburl_access
+import mock_keras2onnx
+from mock_keras2onnx.proto import keras, is_tensorflow_older_than
+from test_utils import is_bloburl_access, run_onnx_runtime
+
 
 sys.path.insert(0, os.path.join(dirname(abspath(__file__)), '../../keras2onnx_tests/'))
-from test_utils import run_onnx_runtime
-from mock_keras2onnx.proto import is_tensorflow_older_than
 
 enable_full_transformer_test = False
 if os.environ.get('ENABLE_FULL_TRANSFORMER_TEST', '0') != '0':
@@ -27,7 +27,7 @@
 
 @unittest.skipIf(is_tensorflow_older_than('2.1.0'),
                  "Transformers conversion need tensorflow 2.1.0+")
-@unittest.skipIf(check_bloburl_access(CONVERTER_TRANSFERMER_PATH), "Model blob url can't access.")
+@unittest.skipIf(not is_bloburl_access(CONVERTER_TRANSFERMER_PATH), "Model blob url can't access.")
 class TestTransformers(unittest.TestCase):
 
     text_str = 'The quick brown fox jumps over lazy dog.'

tests/keras2onnx_applications/nightly_build/test_yolov3.py

@@ -1,27 +1,28 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import os
-import sys
-import unittest
-import mock_keras2onnx
-import onnx
-import numpy as np
 from os.path import dirname, abspath
+import numpy as np
+import unittest
+import sys
 sys.path.insert(0, os.path.join(dirname(abspath(__file__)), '../../keras2onnx_tests/'))
-from keras.models import load_model
-from test_utils import check_bloburl_access
+sys.path.insert(0, os.path.join(dirname(abspath(__file__)), '../yolov3'))
 
+from keras.models import load_model
+import onnx
 import urllib.request
+from yolov3 import YOLO, convert_model
+
+from distutils.version import StrictVersion
+import mock_keras2onnx
+from test_utils import is_bloburl_access
+
+
 YOLOV3_WEIGHTS_PATH = r'https://lotus.blob.core.windows.net/converter-models/yolov3.h5'
 model_file_name = 'yolov3.h5'
 YOLOV3_TINY_WEIGHTS_PATH = r'https://lotus.blob.core.windows.net/converter-models/yolov3-tiny.h5'
 tiny_model_file_name = 'yolov3-tiny.h5'
 
-sys.path.insert(0, os.path.join(dirname(abspath(__file__)), '../yolov3'))
-from yolov3 import YOLO, convert_model
-
-from distutils.version import StrictVersion
-
 working_path = os.path.abspath(os.path.dirname(__file__))
 tmp_path = os.path.join(working_path, 'temp')
 
@@ -46,7 +47,7 @@ def post_compute(self, all_boxes, all_scores, indices):
 
     @unittest.skipIf(StrictVersion(onnx.__version__.split('-')[0]) < StrictVersion("1.5.0"),
                      "NonMaxSuppression op is not supported for onnx < 1.5.0.")
-    @unittest.skipIf(check_bloburl_access(YOLOV3_WEIGHTS_PATH) or check_bloburl_access(YOLOV3_TINY_WEIGHTS_PATH),
+    @unittest.skipIf(not is_bloburl_access(YOLOV3_WEIGHTS_PATH) or not is_bloburl_access(YOLOV3_TINY_WEIGHTS_PATH),
                      "Model blob url can't access.")
     def test_yolov3(self):
         img_path = os.path.join(os.path.dirname(__file__), '../data', 'street.jpg')

tests/keras2onnx_unit_tests/test_utils.py

@@ -284,12 +284,9 @@ def run_image(model, model_files, img_path, model_name='onnx_conversion', rtol=1
     return res, msg
 
 
-def check_bloburl_access(url):
+def is_bloburl_access(url):
     try:
         response = urllib.request.urlopen(url)
         return response.getcode() == 200
-    except urllib.error.URLError as e:
-        mock_keras2onnx.common.k2o_logger().warning("URLError:", e.code)
+    except urllib.error.URLError:
         return False
-    except urllib.error.HTTPError as e:
-        mock_keras2onnx.common.k2o_logger().warning("HTTPError :", e.reason)