SG-38267 Replace mock (#1010)

* Replace mock

* Clean-up

Author: carlos-villavicencio-adsk

tests/platform_tests/test_application.py

@@ -10,20 +10,18 @@
 
 from __future__ import with_statement
 
-import sys
+import inspect
+import logging
 import os
 import shutil
-import logging
 import tempfile
-import mock
-import inspect
+from unittest import mock
 
-from tank_test.tank_test_base import *
 import tank
 from tank.errors import TankError, TankHookMethodDoesNotExistError
-from tank.platform import application, constants, validation
+from tank.platform import application, validation
 from tank.template import Template
-from tank.deploy import descriptor
+from tank_test.tank_test_base import *
 from tank_vendor import six
 from tank_vendor.six import StringIO
 

tests/platform_tests/test_engine.py

@@ -12,27 +12,26 @@
 Engine-related unit tests.
 """
 
-from __future__ import with_statement, print_function
+from __future__ import print_function, with_statement
 
+import contextlib
 import os
+import random
 import sys
 import threading
-import random
 import time
+from unittest import mock
 
+import sgtk
+import tank
+from sgtk.platform import engine
+from tank.errors import TankError
+from tank_test.tank_test_base import setUpModule  # noqa
 from tank_test.tank_test_base import (
     TankTestBase,
     skip_if_pyside_missing,
     suppress_generated_code_qt_warnings,
 )
-from tank_test.tank_test_base import setUpModule  # noqa
-
-import contextlib
-import tank
-import sgtk
-from sgtk.platform import engine
-from tank.errors import TankError
-import mock
 
 
 class TestEngineBase(TankTestBase):

tests/python/tank_test/mock_appstore.py

@@ -16,17 +16,15 @@
 
 import functools
 import sys
+from unittest import mock
 
-import mock
-
-from sgtk.descriptor import Descriptor
+from sgtk.descriptor import Descriptor, create_descriptor
 from sgtk.descriptor.io_descriptor.base import IODescriptorBase
-from sgtk.descriptor import create_descriptor
 from sgtk.util import sgre as re
-
 from tank import TankError
 from tank.platform.environment import InstalledEnvironment
 from tank.util import suppress_known_deprecation
+
 if sys.version_info[0:2] >= (3, 10):
     from setuptools._distutils.version import LooseVersion
 else: