update based on review

Autodesk · Feb 5, 2024 · 61fec76 · 61fec76
1 parent 0969b02
commit 61fec76
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt b/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
@@ -16,8 +16,7 @@ set(INTERACTIVE_TEST_SCRIPT_FILES
     testMayaLights.py
     testFlowViewportAPI.py
     testStageVariants.py
-# Skip until MtoA plugin can be loaded.
-#   testArnoldLights.py
+    testArnoldLights.py
     cpp/testColorPreferences.py
     cpp/testCppFramework.py
     cpp/testMayaSceneFlattening.py

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testArnoldLights.py b/test/lib/mayaUsd/render/mayaToHydra/testArnoldLights.py
@@ -74,7 +74,7 @@ def verifyLightingModes(self, shadowOn):
         #self.assertSnapshotClose("noLight" + imageSuffix + ".png", self.imageDiffFailThreshold, self.imageDiffFailPercent)
 
     #Test arnold lights (e.g., aiSkyDomeLight,etc.) with a maya native sphere and usd sphere.
-    @unittest.skipUnless(mtohUtils.checkForMayaUsdPlugin(), "Requires Maya USD Plugin.")
+    @unittest.skipUnless(mtohUtils.checkForMayaUsdPlugin() and mtohUtils.checkForMtoAPlugin(), "Requires Maya USD and MtoA Plugins.")
     def test_ArnoldLights(self):
         cmds.file(new=True, force=True)
 

diff --git a/test/testUtils/mtohUtils.py b/test/testUtils/mtohUtils.py
@@ -39,6 +39,9 @@ def checkForPlugin(pluginName: str):
 def checkForMayaUsdPlugin():
     return checkForPlugin('mayaUsdPlugin')
 
+def checkForMtoAPlugin():
+    return checkForPlugin('mtoa')
+
 class MayaHydraBaseTestCase(unittest.TestCase):
     '''Base class for mayaHydra unit tests without image comparison.'''