HYDRA-1305 - re-eanble testUSDLights and testOpenPBRSurface with new …

…baselines (#213) * reeanble with new baselines * use different image baselines based on CullMode API is availabe or not * disable testUSDLights on Mac due missing refined wires * update comment
Autodesk · Dec 3, 2024 · 245e282 · 245e282
1 parent c330677
commit 245e282
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt b/test/lib/mayaUsd/render/mayaToHydra/CMakeLists.txt
@@ -27,15 +27,13 @@ set(INTERACTIVE_TEST_SCRIPT_FILES
     testMayaDisplayLayers.py
     testMayaIsolateSelect.py
     testMayaLights.py
-    # To be reenabled after investigation HYDRA-1305
-    #testUSDLights.py
+    testUSDLights.py|skipOnPlatform:osx # HYDRA-1315 : Wire of DiskLight not showing on OSX
     testUVandUDIM.py
     testArnoldLights.py|depOnPlugins:mtoa
     testLookThrough.py
     testObjectTemplate.py
     testStandardSurface.py
-    # To be reenabled after investigation HYDRA-1305
-    #testOpenPBRSurface.py
+    testOpenPBRSurface.py
     testFlowViewportAPI.py
     testStageVariants.py|skipOnPlatform:osx # HYDRA-1127 : refinedWire not working on OSX
     testStagePayloadsReferences.py

diff --git a/...sd/render/mayaToHydra/OpenPBRSurfaceTest/RenderItemHasCullModeAPI/coatColor.png b/...sd/render/mayaToHydra/OpenPBRSurfaceTest/RenderItemHasCullModeAPI/coatColor.png
diff --git a/...d/render/mayaToHydra/OpenPBRSurfaceTest/RenderItemHasCullModeAPI/coatWeight.png b/...d/render/mayaToHydra/OpenPBRSurfaceTest/RenderItemHasCullModeAPI/coatWeight.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/allLights.png b/test/lib/mayaUsd/render/mayaToHydra/USDLightsTest/allLights.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/testOpenPBRSurface.py b/test/lib/mayaUsd/render/mayaToHydra/testOpenPBRSurface.py
@@ -19,6 +19,7 @@
 import mtohUtils
 import mayaUtils
 import platform
+import os
 
 class TestOpenPBRSurface(mtohUtils.MayaHydraBaseTestCase): #Subclassing mtohUtils.MayaHydraBaseTestCase to be able to call self.assertSnapshotClose
     # MayaHydraBaseTestCase.setUpClass requirement.
@@ -97,12 +98,15 @@ def test_OpenPBRSurface(self):
         self.assertSnapshotClose("geometryOpacity" + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
 
         #Verify Coat
+        imageVersion = None
+        if(os.getenv('MAYA_HAS_RENDER_ITEM_CULL_MODE_API', 'NOT-FOUND') in ('1', 'TRUE')):
+            imageVersion = "RenderItemHasCullModeAPI"
         cmds.setAttr("openPBRSurface1.coatWeight", 0.9)
         cmds.refresh()
-        self.assertSnapshotClose("coatWeight" + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
+        self.assertSnapshotClose("coatWeight" + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT, imageVersion)
         cmds.setAttr("openPBRSurface1.coatColor", 0.0,0.0,0.0, type = 'double3')
         cmds.refresh()
-        self.assertSnapshotClose("coatColor" + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)
+        self.assertSnapshotClose("coatColor" + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT, imageVersion)
 
 if __name__ == '__main__':
     fixturesUtils.runTests(globals())