Unit test fixes

Author: gavin-aguiar

tests/unittests/test_rpc_messages.py

@@ -127,13 +127,7 @@ def test_failed_azure_namespace_import(self):
 
     @unittest.skipIf(sys.platform == 'win32',
                      'Linux .sh script only works on Linux')
-    @unittest.skipIf(
-        is_python_version('3.10'),
-        'In Python 3.10, isolate worker dependencies is turned on by default.'
-        ' Reloading all customer dependencies on specialization is a must.'
-        ' This partially reloading namespace feature is no longer needed.'
-    )
     def test_successful_azure_namespace_import(self):
         self._verify_azure_namespace_import(
             'true',
-            'module_b is imported')
+            'module_b fails to import')

tests/unittests/test_utilities_dependency.py

@@ -229,7 +229,7 @@ def test_add_to_sys_path_no_duplication(self):
 
     def test_add_to_sys_path_import_module(self):
         DependencyManager._add_to_sys_path(self._customer_deps_path, True)
-        import common_module # NoQA
+        import common_module  # NoQA
         self.assertEqual(
             common_module.package_location,
             os.path.join(self._customer_deps_path, 'common_module')
@@ -240,7 +240,7 @@ def test_add_to_sys_path_import_namespace_path(self):
         into sys.path
         """
         DependencyManager._add_to_sys_path(self._customer_deps_path, True)
-        import common_namespace # NoQA
+        import common_namespace  # NoQA
         self.assertEqual(len(common_namespace.__path__), 1)
         self.assertEqual(
             common_namespace.__path__[0],
@@ -517,7 +517,7 @@ def test_clear_path_importer_cache_and_modules_retain_namespace(self):
         sys.path.insert(0, self._worker_deps_path)
 
         # Ensure new import is from _worker_deps_path
-        import common_module as worker_mod # NoQA
+        import common_module as worker_mod  # NoQA
         self.assertIn('common_module', sys.modules)
         self.assertEqual(
             worker_mod.package_location,
@@ -555,39 +555,6 @@ def test_use_worker_dependencies_disable(self):
         with self.assertRaises(ImportError):
             import common_module  # NoQA
 
-    @unittest.skipUnless(
-        sys.version_info.major == 3 and sys.version_info.minor != 10,
-        'Test only available for Python 3.6, 3.7, 3.8 or 3.9'
-    )
-    def test_use_worker_dependencies_default_python_36_37_38_39(self):
-        # Feature should be disabled in Python 3.6, 3.7, 3.8 and 3.9
-        # Setup paths
-        DependencyManager.worker_deps_path = self._worker_deps_path
-        DependencyManager.cx_deps_path = self._customer_deps_path
-        DependencyManager.cx_working_dir = self._customer_func_path
-
-        # The common_module cannot be imported since feature is disabled
-        DependencyManager.use_worker_dependencies()
-        with self.assertRaises(ImportError):
-            import common_module  # NoQA
-
-    @unittest.skip('Skipping since PYTHON_ISOLATE_WORKER_DEPENDENCIES is '
-                   'disabled by default')
-    def test_use_worker_dependencies_default_python_310(self):
-        # Feature should be enabled in Python 3.10 by default
-        # Setup paths
-        DependencyManager.worker_deps_path = self._worker_deps_path
-        DependencyManager.cx_deps_path = self._customer_deps_path
-        DependencyManager.cx_working_dir = self._customer_func_path
-
-        # Ensure the common_module is imported from _worker_deps_path
-        DependencyManager.use_worker_dependencies()
-        import common_module  # NoQA
-        self.assertEqual(
-            common_module.package_location,
-            os.path.join(self._worker_deps_path, 'common_module')
-        )
-
     def test_prioritize_customer_dependencies(self):
         # Setup app settings
         os.environ['PYTHON_ISOLATE_WORKER_DEPENDENCIES'] = 'true'
@@ -626,37 +593,6 @@ def test_prioritize_customer_dependencies_disable(self):
         with self.assertRaises(ImportError):
             import common_module  # NoQA
 
-    @unittest.skipIf(is_python_version('3.10'),
-                     'Test not available for python 3.10')
-    def test_prioritize_customer_dependencies_default_python_36_37_38_39(self):
-        # Feature should be disabled in Python 3.6, 3.7, 3.8 and 3.9
-        # Setup paths
-        DependencyManager.worker_deps_path = self._worker_deps_path
-        DependencyManager.cx_deps_path = self._customer_deps_path
-        DependencyManager.cx_working_dir = self._customer_func_path
-
-        # Ensure the common_module is imported from _customer_deps_path
-        DependencyManager.prioritize_customer_dependencies()
-        with self.assertRaises(ImportError):
-            import common_module  # NoQA
-
-    @unittest.skip('Skipping since PYTHON_ISOLATE_WORKER_DEPENDENCIES is '
-                   'disabled by default')
-    def test_prioritize_customer_dependencies_default_python_310(self):
-        # Feature should be enabled in Python 3.10 by default
-        # Setup paths
-        DependencyManager.worker_deps_path = self._worker_deps_path
-        DependencyManager.cx_deps_path = self._customer_deps_path
-        DependencyManager.cx_working_dir = self._customer_func_path
-
-        # Ensure the common_module is imported from _customer_deps_path
-        DependencyManager.prioritize_customer_dependencies()
-        import common_module  # NoQA
-        self.assertEqual(
-            common_module.package_location,
-            os.path.join(self._customer_deps_path, 'common_module')
-        )
-
     def test_prioritize_customer_dependencies_from_working_directory(self):
         self._initialize_scenario()