Skip to content

Commit

Permalink
HYDRA-1043 : Remove default material test on usd prims on OSX as they…
Browse files Browse the repository at this point in the history
… are not all supported.
  • Loading branch information
lanierd-adsk committed Sep 19, 2024
1 parent 49620ae commit f7927d1
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 38 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import mayaUtils
from testUtils import PluginLoaded
import platform
import unittest

class TestMayaDefaultMaterial(mtohUtils.MayaHydraBaseTestCase): #Subclassing mtohUtils.MayaHydraBaseTestCase to be able to call self.assertSnapshotClose
# MayaHydraBaseTestCase.setUpClass requirement.
Expand All @@ -45,15 +46,14 @@ def test_MayaDefaultMaterial(self):
cmds.refresh()
self.assertSnapshotClose("defaultMaterial" + ".png", self.IMAGE_DIFF_FAIL_THRESHOLD, self.IMAGE_DIFF_FAIL_PERCENT)

@unittest.skipUnless(platform.system() != "Darwin", 'This test is disabled on OSX as not all implicit surfaces are fully implemented on OSX.')
def test_MayaDefaultMaterialUsdPrims(self):
# open a Maya scene with usd prims (sphere, capsule, cube, cylinder ...)
testFile = mayaUtils.openTestScene(
"testDefaultMaterial",
"testMayaDefaultMaterial_Usd_proceduralShapes.ma", useTestSettings=False)
cmds.refresh()

#Cone and cylinder_1 are not supported on OSX with USD 24.05 so they are not in our test scene

#Use Default Material
panel = mayaUtils.activeModelPanel()
cmds.modelEditor(panel, edit=True, useDefaultMaterial=True)
Expand Down
Loading

0 comments on commit f7927d1

Please sign in to comment.