HYDRA-861 : Adjust testRefinement and testUsdNativeInstancePicking + …

…remove a bunch of unused imports
Autodesk · Mar 26, 2024 · 31354e8 · 31354e8
1 parent 2772837
commit 31354e8
Show file tree

Hide file tree

Showing 25 changed files with 2 additions and 50 deletions.
diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testMayaUsdUfeItems.py b/test/lib/mayaUsd/render/mayaToHydra/cpp/testMayaUsdUfeItems.py
@@ -16,7 +16,6 @@
 
 import fixturesUtils
 import mtohUtils
-import unittest
 
 from testUtils import PluginLoaded
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testPathInterface.py b/test/lib/mayaUsd/render/mayaToHydra/cpp/testPathInterface.py
@@ -23,8 +23,6 @@
 
 from testUtils import PluginLoaded
 
-import unittest
-
 class TestPathInterface(mtohUtils.MayaHydraBaseTestCase):
     # MayaHydraBaseTestCase.setUpClass requirement.
     _file = __file__

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testPicking.py b/test/lib/mayaUsd/render/mayaToHydra/cpp/testPicking.py
@@ -16,7 +16,6 @@
 import fixturesUtils
 import mayaUtils
 import mtohUtils
-import unittest
 
 from testUtils import PluginLoaded
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testPointInstancePicking.py b/test/lib/mayaUsd/render/mayaToHydra/cpp/testPointInstancePicking.py
@@ -15,7 +15,6 @@
 import maya.cmds as cmds
 import fixturesUtils
 import mtohUtils
-import unittest
 import usdUtils
 
 import testUtils

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testPrimInstancing.py b/test/lib/mayaUsd/render/mayaToHydra/cpp/testPrimInstancing.py
@@ -16,7 +16,6 @@
 
 import fixturesUtils
 import mtohUtils
-import unittest
 
 import testUtils
 from testUtils import PluginLoaded

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testSceneCorrectness.py b/test/lib/mayaUsd/render/mayaToHydra/cpp/testSceneCorrectness.py
@@ -16,7 +16,6 @@
 
 import fixturesUtils
 import mtohUtils
-import unittest
 
 import testUtils
 from testUtils import PluginLoaded

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testUsdNativeInstancePicking.py b/test/lib/mayaUsd/render/mayaToHydra/cpp/testUsdNativeInstancePicking.py
@@ -15,13 +15,12 @@
 import maya.cmds as cmds
 import fixturesUtils
 import mtohUtils
-import unittest
 import usdUtils
 
 import testUtils
 from testUtils import PluginLoaded
 
-class TestUsdNativeInstancePicking(mtohUtils.MtohTestCase):
+class TestUsdNativeInstancePicking(mtohUtils.MayaHydraBaseTestCase):
     # MayaHydraBaseTestCase.setUpClass requirement.
     _file = __file__
 
@@ -36,7 +35,6 @@ def setUp(self):
         self.loadUsdScene()
         cmds.refresh()
 
-    @unittest.skipUnless(mtohUtils.checkForMayaUsdPlugin(), "Requires Maya USD Plugin.")
     def test_NativeInstances(self):
         with PluginLoaded('mayaHydraCppTests'):
             instances = ["/cubes_1", "/cubes_2"]

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testUsdStageLayerMuting.py b/test/lib/mayaUsd/render/mayaToHydra/cpp/testUsdStageLayerMuting.py
@@ -16,7 +16,6 @@
 
 import fixturesUtils
 import mtohUtils
-import unittest
 
 from testUtils import PluginLoaded
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/cpp/testWireframeSelectionHighlightSceneIndex.py b/test/lib/mayaUsd/render/mayaToHydra/cpp/testWireframeSelectionHighlightSceneIndex.py
@@ -4,8 +4,6 @@
 import mayaUtils
 from testUtils import PluginLoaded
 
-import unittest
-
 class TestWireframeSelectionHighlightSceneIndex(mtohUtils.MayaHydraBaseTestCase):
     # MayaHydraBaseTestCase.setUpClass requirement.
     _file = __file__

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testArnoldLights.py b/test/lib/mayaUsd/render/mayaToHydra/testArnoldLights.py
@@ -18,7 +18,6 @@
 import fixturesUtils
 import mtohUtils
 import mayaUtils
-import unittest
 import platform
 
 class TestArnoldLights(mtohUtils.MayaHydraBaseTestCase): #Subclassing mtohUtils.MayaHydraBaseTestCase to be able to call self.assertSnapshotClose

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testImageDiffing.py b/test/lib/mayaUsd/render/mayaToHydra/testImageDiffing.py
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import os.path
-import sys
-import unittest
-
-import maya.cmds as cmds
-import maya.mel
-
 import fixturesUtils
 import mtohUtils
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testMaterialXOnNative.py b/test/lib/mayaUsd/render/mayaToHydra/testMaterialXOnNative.py
@@ -16,7 +16,6 @@
 import mayaUtils
 import fixturesUtils
 import mtohUtils
-import unittest
 
 class TestMaterialXOnNative(mtohUtils.MayaHydraBaseTestCase):
     _file = __file__

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testMayaDisplayModes.py b/test/lib/mayaUsd/render/mayaToHydra/testMayaDisplayModes.py
@@ -18,7 +18,6 @@
 import fixturesUtils
 import mtohUtils
 import mayaUtils
-import unittest
 from testUtils import PluginLoaded
 
 import platform

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testMayaLights.py b/test/lib/mayaUsd/render/mayaToHydra/testMayaLights.py
@@ -18,7 +18,6 @@
 import fixturesUtils
 import mtohUtils
 import mayaUtils
-import unittest
 
 import platform
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testMayaUsdAPIUsage.py b/test/lib/mayaUsd/render/mayaToHydra/testMayaUsdAPIUsage.py
@@ -17,7 +17,6 @@
 import maya.cmds as cmds
 import fixturesUtils
 import mtohUtils
-import unittest
 import mayaUtils
 import platform
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testMtohBasicRender.py b/test/lib/mayaUsd/render/mayaToHydra/testMtohBasicRender.py
@@ -14,11 +14,6 @@
 # limitations under the License.
 #
 # Test to make sure that our snapshot-comparison tools work
-
-import os.path
-import sys
-import unittest
-
 import maya.cmds as cmds
 import maya.mel
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testMtohDagChanges.py b/test/lib/mayaUsd/render/mayaToHydra/testMtohDagChanges.py
@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-import sys
-import unittest
-
 import maya.cmds as cmds
 import maya.mel
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testNewSceneWithStage.py b/test/lib/mayaUsd/render/mayaToHydra/testNewSceneWithStage.py
@@ -17,8 +17,6 @@
 import fixturesUtils
 import mtohUtils
 
-import unittest
-
 class TestStage(mtohUtils.MayaHydraBaseTestCase):
     # MayaHydraBaseTestCase.setUpClass requirement.
     _file = __file__

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testRefinement.py b/test/lib/mayaUsd/render/mayaToHydra/testRefinement.py
@@ -16,10 +16,9 @@
 
 import fixturesUtils
 import mtohUtils
-import unittest
 import testUtils
 
-class TestRefinement(mtohUtils.MtohTestCase):
+class TestRefinement(mtohUtils.MayaHydraBaseTestCase):
     _file = __file__
 
     IMAGEDIFF_FAIL_THRESHOLD = 0.01
@@ -31,7 +30,6 @@ def verifySnapshot(self, imageName):
                                  self.IMAGEDIFF_FAIL_THRESHOLD,
                                  self.IMAGEDIFF_FAIL_PERCENT)
 
-    @unittest.skipUnless(mtohUtils.checkForMayaUsdPlugin(), "Requires Maya USD Plugin.")
     def test_usdPrim(self):
         import usdUtils
         usdScenePath = testUtils.getTestScene('testStagePayloadsReferences', 'cube.usda')

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testSceneBrowser.py b/test/lib/mayaUsd/render/mayaToHydra/testSceneBrowser.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 #
 import maya.cmds as cmds
-import maya.mel as mel
 
 import fixturesUtils
 import mtohUtils

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testStageAddPrim.py b/test/lib/mayaUsd/render/mayaToHydra/testStageAddPrim.py
@@ -16,11 +16,6 @@
 
 import fixturesUtils
 import mtohUtils
-import mayaUtils
-from testUtils import PluginLoaded
-
-import unittest
-import sys
 
 class TestStage(mtohUtils.MayaHydraBaseTestCase):
     # MayaHydraBaseTestCase.setUpClass requirement.

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testStagePayloadsReferences.py b/test/lib/mayaUsd/render/mayaToHydra/testStagePayloadsReferences.py
@@ -17,7 +17,6 @@
 import maya.cmds as cmds
 import fixturesUtils
 import mtohUtils
-import unittest
 import testUtils
 import mayaUtils
 import ufe

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testStageVariants.py b/test/lib/mayaUsd/render/mayaToHydra/testStageVariants.py
@@ -17,8 +17,6 @@
 import maya.cmds as cmds
 import fixturesUtils
 import mtohUtils
-import unittest
-import testUtils
 import mayaUtils
 import ufe
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testTransforms.py b/test/lib/mayaUsd/render/mayaToHydra/testTransforms.py
@@ -13,11 +13,9 @@
 # limitations under the License.
 #
 import maya.cmds as cmds
-import maya.mel
 
 import fixturesUtils
 import mtohUtils
-import unittest
 
 class TestTransforms(mtohUtils.MayaHydraBaseTestCase):
     _file = __file__

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testUSDLights.py b/test/lib/mayaUsd/render/mayaToHydra/testUSDLights.py
@@ -18,7 +18,6 @@
 import fixturesUtils
 import mtohUtils
 import mayaUtils
-import unittest
 import platform
 
 class TestUSDLights(mtohUtils.MayaHydraBaseTestCase): #Subclassing mtohUtils.MayaHydraBaseTestCase to be able to call self.assertSnapshotClose