瀏覽代碼

HUE-8737 [core] Fix missing module mock in py3

Ying Chen 6 年之前
父節點
當前提交
d1d978371a

+ 5 - 1
apps/beeswax/src/beeswax/management/commands/beeswax_install_examples_tests.py

@@ -17,8 +17,8 @@
 # limitations under the License.
 
 import logging
+import sys
 
-from mock import patch, Mock, MagicMock
 from nose.tools import assert_equal, assert_not_equal, assert_true, assert_false
 
 from desktop.auth.backend import rewrite_user
@@ -29,6 +29,10 @@ from beeswax.management.commands.beeswax_install_examples import SampleTable, Co
 
 from django.contrib.auth.models import User
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock
+else:
+  from mock import patch, Mock
 
 LOG = logging.getLogger(__name__)
 

+ 5 - 1
apps/beeswax/src/beeswax/server/dbms_tests.py

@@ -17,15 +17,19 @@
 # limitations under the License.
 
 import logging
+import sys
 
 from django.core.cache import caches
-from mock import patch, Mock
 from nose.tools import assert_equal, assert_true
 
 from desktop.settings import CACHES_HIVE_DISCOVERY_KEY
 
 from beeswax.server.dbms import get_query_server_config
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock
+else:
+  from mock import patch, Mock
 
 LOG = logging.getLogger(__name__)
 cache = caches[CACHES_HIVE_DISCOVERY_KEY]

+ 5 - 1
apps/impala/src/impala/api_tests.py

@@ -18,15 +18,19 @@
 from builtins import object
 import json
 import logging
+import sys
 
 from django.urls import reverse
 from nose.tools import assert_true, assert_equal, assert_false, assert_raises
-from mock import patch, Mock
 
 from desktop.lib.django_test_util import make_logged_in_client
 
 from impala import conf
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock
+else:
+  from mock import patch, Mock
 
 LOG = logging.getLogger(__name__)
 

+ 5 - 1
apps/impala/src/impala/tests.py

@@ -19,10 +19,10 @@ from builtins import object
 import json
 import logging
 import re
+import sys
 
 from nose.plugins.skip import SkipTest
 from nose.tools import assert_true, assert_equal, assert_false, assert_raises
-from mock import patch, Mock
 
 from django.urls import reverse
 
@@ -44,6 +44,10 @@ from useradmin.models import User
 from impala import conf
 from impala.dbms import ImpalaDbms
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock
+else:
+  from mock import patch, Mock
 
 LOG = logging.getLogger(__name__)
 

+ 5 - 1
apps/metastore/src/metastore/tests.py

@@ -21,9 +21,9 @@ standard_library.install_aliases()
 from builtins import object
 import json
 import logging
+import sys
 import urllib.request, urllib.parse, urllib.error
 
-from mock import patch, Mock
 from nose.plugins.skip import SkipTest
 from nose.tools import assert_true, assert_equal, assert_false
 
@@ -43,6 +43,10 @@ from beeswax.models import QueryHistory
 from beeswax.server import dbms
 from beeswax.test_base import BeeswaxSampleProvider
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock
+else:
+  from mock import patch, Mock
 
 LOG = logging.getLogger(__name__)
 

+ 5 - 1
desktop/core/src/desktop/lib/connectors/tests.py

@@ -15,12 +15,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import sys
 
-from mock import patch, Mock, MagicMock
 from nose.tools import assert_equal, assert_true, assert_false
 
 from desktop.lib.connectors.api import _get_installed_connectors
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock
+else:
+  from mock import patch, Mock
 
 def test_get_installed_editor_connectors():
 

+ 7 - 1
desktop/core/src/desktop/lib/fs/proxyfs_test.py

@@ -16,8 +16,9 @@
 
 from __future__ import absolute_import
 
+import sys
+
 from builtins import object
-from mock import MagicMock, patch
 from nose.plugins.attrib import attr
 from nose.tools import assert_raises, assert_false, eq_
 from nose import SkipTest
@@ -29,6 +30,11 @@ from desktop.lib.fs import ProxyFS
 from desktop.lib.django_test_util import make_logged_in_client
 from desktop.lib.test_utils import add_permission, remove_from_group
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, MagicMock
+else:
+  from mock import patch, MagicMock
+
 
 def test_fs_selection():
   make_logged_in_client(username='test', groupname='default', recreate=True, is_superuser=False)

+ 6 - 1
desktop/core/src/desktop/lib/idbroker/tests.py

@@ -17,12 +17,17 @@ from __future__ import absolute_import
 
 import logging
 import unittest
+import sys
 
-from mock import patch, Mock
 from nose.tools import assert_equal, assert_true
 
 from desktop.lib.idbroker.client import IDBroker
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch
+else:
+  from mock import patch
+
 LOG = logging.getLogger(__name__)
 
 class TestIDBroker(unittest.TestCase):

+ 0 - 1
desktop/libs/indexer/src/indexer/indexers/sql_tests.py

@@ -19,7 +19,6 @@
 from builtins import object
 import json
 
-from mock import patch, Mock, MagicMock
 from nose.tools import assert_equal, assert_true
 
 from desktop.lib.django_test_util import make_logged_in_client

+ 6 - 1
desktop/libs/libsaml/src/libsaml/tests.py

@@ -16,11 +16,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from mock import patch, Mock, MagicMock
+import sys
+
 from nose.tools import assert_equal, assert_true, assert_false
 
 from libsaml.conf import xmlsec
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock
+else:
+  from mock import patch, Mock
 
 def test_xmlsec_dynamic_default_no_which():
 

+ 5 - 1
desktop/libs/notebook/src/notebook/connectors/hiveserver2_tests.py

@@ -21,9 +21,9 @@ from builtins import object
 import json
 import logging
 import re
+import sys
 import time
 
-from mock import patch, Mock
 from nose.plugins.skip import SkipTest
 from nose.tools import assert_equal, assert_true
 
@@ -44,6 +44,10 @@ from notebook.api import _save_notebook
 from notebook.connectors.hiveserver2 import HS2Api
 from notebook.models import make_notebook, Notebook
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock
+else:
+  from mock import patch, Mock
 
 LOG = logging.getLogger(__name__)
 

+ 5 - 1
desktop/libs/notebook/src/notebook/connectors/sql_alchemy_tests.py

@@ -18,8 +18,8 @@
 
 from builtins import object
 import logging
+import sys
 
-from mock import patch, Mock, MagicMock
 from nose.tools import assert_equal, assert_not_equal, assert_true, assert_false
 
 from desktop.auth.backend import rewrite_user
@@ -29,6 +29,10 @@ from useradmin.models import User
 
 from notebook.connectors.sql_alchemy import SqlAlchemyApi
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch, Mock, MagicMock
+else:
+  from mock import patch, Mock, MagicMock
 
 LOG = logging.getLogger(__name__)
 

+ 6 - 1
desktop/libs/notebook/src/notebook/tests.py

@@ -18,9 +18,9 @@
 
 from builtins import object
 import json
+import sys
 
 from collections import OrderedDict
-from mock import patch, Mock, MagicMock
 from nose.plugins.attrib import attr
 from nose.tools import assert_equal, assert_true, assert_false
 
@@ -43,6 +43,11 @@ from notebook.decorators import api_error_handler
 from notebook.conf import get_ordered_interpreters, INTERPRETERS_SHOWN_ON_WHEEL, INTERPRETERS
 from notebook.models import Analytics
 
+if sys.version_info[0] > 2:
+  from unittest.mock import patch
+else:
+  from mock import patch
+
 
 class TestNotebookApi(object):