Merge pull request #2227 from Autodesk/krickw/update_tests_for_defaul…

…t_viewport_changes Fix preflight test failures
Autodesk · Mar 31, 2022 · 132c056 · 132c056
2 parents 3885eb0 + f3fb67c
commit 132c056
Show file tree

Hide file tree

Showing 37 changed files with 64 additions and 40 deletions.
diff --git a/lib/usd/hdMaya/adapters/materialNetworkConverter.cpp b/lib/usd/hdMaya/adapters/materialNetworkConverter.cpp
@@ -577,7 +577,6 @@ void HdMayaMaterialNetworkConverter::initialize()
                 { HdMayaAdapterTokens->clearcoatRoughness, coatRoughnessConverter },
                 { HdMayaAdapterTokens->opacity, transmissionToOpacity },
                 { HdMayaAdapterTokens->metallic, fixedZeroFloat },
-                { HdMayaAdapterTokens->useSpecularWorkflow, fixedOneInt },
             } } },
         { HdMayaAdapterTokens->file,
           { UsdImagingTokens->UsdUVTexture,

diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohBasicRenderTest/cube_selected.png b/test/lib/mayaUsd/render/mayaToHydra/MtohBasicRenderTest/cube_selected.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohBasicRenderTest/cube_unselected.png b/test/lib/mayaUsd/render/mayaToHydra/MtohBasicRenderTest/cube_unselected.png
diff --git a/...render/mayaToHydra/MtohBasicRenderTest/lambertDefaultMaterial/cube_selected.png b/...render/mayaToHydra/MtohBasicRenderTest/lambertDefaultMaterial/cube_selected.png
diff --git a/...nder/mayaToHydra/MtohBasicRenderTest/lambertDefaultMaterial/cube_unselected.png b/...nder/mayaToHydra/MtohBasicRenderTest/lambertDefaultMaterial/cube_unselected.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_12.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_12.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_123.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_123.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1234.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1234.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_123456.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_123456.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1235.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_1235.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_3.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_3.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_35.png b/test/lib/mayaUsd/render/mayaToHydra/MtohDagChangesTest/instances_35.png
diff --git a/...sd/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_0.png b/...sd/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_0.png
diff --git a/...sd/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_1.png b/...sd/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_1.png
diff --git a/...d/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_12.png b/...d/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_12.png
diff --git a/.../render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_123.png b/.../render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_123.png
diff --git a/...render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_1234.png b/...render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_1234.png
diff --git a/...nder/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_123456.png b/...nder/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_123456.png
diff --git a/...render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_1235.png b/...render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_1235.png
diff --git a/...sd/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_3.png b/...sd/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_3.png
diff --git a/...d/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_35.png b/...d/render/mayaToHydra/MtohDagChangesTest/lambertDefaultMaterial/instances_35.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/MtohVisibilityTest/cube_unselected.png b/test/lib/mayaUsd/render/mayaToHydra/MtohVisibilityTest/cube_unselected.png
diff --git a/...ender/mayaToHydra/MtohVisibilityTest/lambertDefaultMaterial/cube_unselected.png b/...ender/mayaToHydra/MtohVisibilityTest/lambertDefaultMaterial/cube_unselected.png
diff --git a/test/lib/mayaUsd/render/mayaToHydra/testMtohBasicRender.py b/test/lib/mayaUsd/render/mayaToHydra/testMtohBasicRender.py
@@ -5,6 +5,7 @@
 import unittest
 
 import maya.cmds as cmds
+import maya.mel
 
 import fixturesUtils
 import mtohUtils
@@ -47,17 +48,21 @@ def test_flat_orange(self):
         # flat_orange_bad.png, and 163200000 is the maximum diff for an 8-bit,
         # 40x40, 4-channel image.  So this tests that assertSnapshotClose is
         # working
-        self.assertSnapshotClose("flat_orange_bad.png", 17515 / 163200000.0)
+        self.assertSnapshotClose("flat_orange_bad.png", None, 17515 / 163200000.0)
 
 
 class TestHdMayaRender(mtohUtils.MtohTestCase):
     _file = __file__
 
     def test_cube(self):
+        imageVersion = None
+        if maya.mel.eval("defaultShaderName") != "standardSurface1":
+            imageVersion = 'lambertDefaultMaterial'
+
         self.makeCubeScene(camDist=6)
-        self.assertSnapshotClose("cube_unselected.png")
+        self.assertSnapshotClose("cube_unselected.png", imageVersion, 0.0002)
         cmds.select(self.cubeTrans)
-        self.assertSnapshotClose("cube_selected.png")
+        self.assertSnapshotClose("cube_selected.png", imageVersion, 0.0002)
 
 
 if __name__ == '__main__':

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testMtohDagChanges.py b/test/lib/mayaUsd/render/mayaToHydra/testMtohDagChanges.py
@@ -2,6 +2,7 @@
 import unittest
 
 import maya.cmds as cmds
+import maya.mel
 
 import fixturesUtils
 import mtohUtils
@@ -18,6 +19,10 @@ def setUp(self):
         self.grp2 = cmds.createNode('transform', name='group2')
         self.grp2Rprim = self.rprimPath(self.grp2)
 
+        self.imageVersion = None
+        if maya.mel.eval("defaultShaderName") != "standardSurface1":
+            self.imageVersion = 'lambertDefaultMaterial'
+
     def test_reparent_transform(self):
         cmds.parent(self.cubeTrans, self.grp1)
         grp1ShapeRprim = self.rprimPath(self.cubeShape)
@@ -93,22 +98,22 @@ def test_instances(self):
 
             # No instances to start
             #   (1) |pCube1|pCubeShape1
-            self.assertSnapshotClose("instances_1.png")
+            self.assertSnapshotClose("instances_1.png", self.imageVersion)
 
             # Add |group1|pCube1 instance
             #   (1) |pCube1|pCubeShape1
             #   (2) |group1|pCube1|pCubeShape1
             cmds.parent(self.cubeTrans, self.grp1, add=1, r=1)
             cmds.select(clear=1)
-            self.assertSnapshotClose("instances_12.png")
+            self.assertSnapshotClose("instances_12.png", self.imageVersion)
 
             # Add |pCube2|pCubeShape1 instance
             #   (1) |pCube1|pCubeShape1
             #   (2) |group1|pCube1|pCubeShape1
             #   (3) |pCube2|pCubeShape1
             cmds.parent(self.cubeShape, pCube2, add=1, r=1, shape=1)
             cmds.select(clear=1)
-            self.assertSnapshotClose("instances_123.png")
+            self.assertSnapshotClose("instances_123.png", self.imageVersion)
 
             # Add |group2|group1|pCube1 instance
             #   (1) |pCube1|pCubeShape1
@@ -117,7 +122,7 @@ def test_instances(self):
             #   (4) |group2||group1|pCube1|pCubeShape1
             cmds.parent(self.grp1, self.grp2, add=1, r=1)
             cmds.select(clear=1)
-            self.assertSnapshotClose("instances_1234.png")
+            self.assertSnapshotClose("instances_1234.png", self.imageVersion)
 
             # Add |group1|pCube2 instance
             #   (1) |pCube1|pCubeShape1
@@ -128,7 +133,7 @@ def test_instances(self):
             #   (6) |group2||group1|pCube2|pCubeShape1
             cmds.parent(pCube2, self.grp1, add=1, r=1)
             cmds.select(clear=1)
-            self.assertSnapshotClose("instances_123456.png")
+            self.assertSnapshotClose("instances_123456.png", self.imageVersion)
 
             # Delete group2
             #   [no shapes]
@@ -137,7 +142,7 @@ def test_instances(self):
             try:
                 cmds.delete(self.grp2)
                 self.assertNotIn(self.cubeRprim, self.getIndex())
-                self.assertSnapshotClose("instances_0.png")
+                self.assertSnapshotClose("instances_0.png", self.imageVersion)
             finally:
                 cmds.undoInfo(closeChunk=1)
 
@@ -149,7 +154,7 @@ def test_instances(self):
             #   (5) |group1|pCube2|pCubeShape1
             #   (6) |group2||group1|pCube2|pCubeShape1
             cmds.undo()
-            self.assertSnapshotClose("instances_123456.png")
+            self.assertSnapshotClose("instances_123456.png", self.imageVersion)
 
             # Remove |group2|group1 instance
             #   (1) |pCube1|pCubeShape1
@@ -158,7 +163,7 @@ def test_instances(self):
             #   (5) |group1|pCube2|pCubeShape1
             cmds.parent('|{self.grp2}|{self.grp1}'.format(self=self),
                         removeObject=1)
-            self.assertSnapshotClose("instances_1235.png")
+            self.assertSnapshotClose("instances_1235.png", self.imageVersion)
 
             # Remove pCube2|pCubeShape1 instance
             #   (1) |pCube1|pCubeShape1
@@ -168,7 +173,7 @@ def test_instances(self):
                 cmds.parent('|{pCube2}|{self.cubeShape}'.format(self=self,
                                                                     pCube2=pCube2),
                             removeObject=1, shape=1)
-                self.assertSnapshotClose("instances_12.png")
+                self.assertSnapshotClose("instances_12.png", self.imageVersion)
             finally:
                 cmds.undoInfo(closeChunk=1)
 
@@ -178,7 +183,7 @@ def test_instances(self):
             #   (3) |pCube2|pCubeShape1
             #   (5) |group1|pCube2|pCubeShape1
             cmds.undo()
-            self.assertSnapshotClose("instances_1235.png")
+            self.assertSnapshotClose("instances_1235.png", self.imageVersion)
 
             # Remove pCube1|pCubeShape1 (the "master" instance)
             #   (3) |pCube2|pCubeShape1
@@ -187,7 +192,7 @@ def test_instances(self):
             try:
                 cmds.parent('|{self.cubeTrans}|{self.cubeShape}'.format(self=self),
                             removeObject=1, shape=1)
-                self.assertSnapshotClose("instances_35.png")
+                self.assertSnapshotClose("instances_35.png", self.imageVersion)
             finally:
                 cmds.undoInfo(closeChunk=1)
 
@@ -202,29 +207,29 @@ def test_instances(self):
             # need to disable without flusing the queue, so we can test redo
             cmds.undoInfo(stateWithoutFlush=0)
             try:
-                self.assertSnapshotClose("instances_1235.png")
+                self.assertSnapshotClose("instances_1235.png", self.imageVersion)
             finally:
                 cmds.undoInfo(stateWithoutFlush=1)
 
             # Redo remove pCube2|pCubeShape1 instance
             #   (3) |pCube2|pCubeShape1
             #   (5) |group1|pCube2|pCubeShape1
             cmds.redo()
-            self.assertSnapshotClose("instances_35.png")
+            self.assertSnapshotClose("instances_35.png", self.imageVersion)
 
             # Remove |group1|pCube2 instance
             #   (3) |pCube2|pCubeShape1
             cmds.parent('{self.grp1}|{pCube2}'.format(self=self,
                                                       pCube2=pCube2),
                         removeObject=1)
-            self.assertSnapshotClose("instances_3.png")
+            self.assertSnapshotClose("instances_3.png", self.imageVersion)
         finally:
             cmds.undoInfo(state=undoWasEnabled)
 
     def test_move(self):
-        self.assertSnapshotClose("instances_1.png")
+        self.assertSnapshotClose("instances_1.png", self.imageVersion)
         cmds.setAttr('{}.ty'.format(self.cubeTrans), 5)
-        self.assertSnapshotClose("instances_3.png")
+        self.assertSnapshotClose("instances_3.png", self.imageVersion)
 
     def test_instance_move(self):
         # Add |group1|pCube1 instance
@@ -235,11 +240,11 @@ def test_instance_move(self):
 
         # because we haven't moved anything, it should initially look like only
         # one cube...
-        self.assertSnapshotClose("instances_1.png")
+        self.assertSnapshotClose("instances_1.png", self.imageVersion)
 
         cmds.setAttr('{}.tz'.format(self.grp1), 5)
         # Now that we moved one, it should look like 2 cubes
-        self.assertSnapshotClose("instances_12.png")
+        self.assertSnapshotClose("instances_12.png", self.imageVersion)
 
 
 class TestUndo(mtohUtils.MtohTestCase):
@@ -248,6 +253,10 @@ class TestUndo(mtohUtils.MtohTestCase):
     def test_node_creation_undo(self):
         undoWasEnabled = cmds.undoInfo(q=1, state=1)
 
+        self.imageVersion = None
+        if maya.mel.eval("defaultShaderName") != "standardSurface1":
+            self.imageVersion = 'lambertDefaultMaterial'
+
         cmds.undoInfo(state=0)
         try:
             cmds.file(new=1, f=1)
@@ -264,7 +273,7 @@ def test_node_creation_undo(self):
                 cmds.select(clear=1)
                 cmds.refresh()
                 self.assertEqual([cubeRprim], self.getIndex())
-                self.assertSnapshotClose("instances_1.png")
+                self.assertSnapshotClose("instances_1.png", self.imageVersion)
             finally:
                 cmds.undoInfo(closeChunk=1)
 
@@ -276,7 +285,7 @@ def test_node_creation_undo(self):
             try:
                 cmds.refresh()
                 self.assertEqual([], self.getIndex())
-                self.assertSnapshotClose("instances_0.png")
+                self.assertSnapshotClose("instances_0.png", self.imageVersion)
             finally:
                 cmds.undoInfo(stateWithoutFlush=1)
 
@@ -286,7 +295,7 @@ def test_node_creation_undo(self):
             try:
                 cmds.refresh()
                 self.assertEqual([cubeRprim], self.getIndex())
-                self.assertSnapshotClose("instances_1.png")
+                self.assertSnapshotClose("instances_1.png", self.imageVersion)
             finally:
                 cmds.undoInfo(stateWithoutFlush=1)
 

diff --git a/test/lib/mayaUsd/render/mayaToHydra/testMtohVisibility.py b/test/lib/mayaUsd/render/mayaToHydra/testMtohVisibility.py
@@ -1,4 +1,5 @@
 import maya.cmds as cmds
+import maya.mel
 
 import fixturesUtils
 import mtohUtils
@@ -10,6 +11,9 @@ def setUp(self):
         self.makeCubeScene(camDist=6)
         self.assertTrue(cmds.getAttr("{}.visibility".format(self.cubeTrans)))
         self.assertTrue(cmds.getAttr("{}.visibility".format(self.cubeShape)))
+        self.imageVersion = None
+        if maya.mel.eval("defaultShaderName") != "standardSurface1":
+            self.imageVersion = 'lambertDefaultMaterial'
 
     def test_toggleTransVis(self):
         # because snapshotting is slow, we only use it in this test - otherwise
@@ -23,7 +27,7 @@ def test_toggleTransVis(self):
         self.assertIn(
             self.cubeRprim,
             self.getVisibleIndex())
-        self.assertSnapshotClose(cubeUnselectedImg)
+        self.assertSnapshotClose(cubeUnselectedImg, self.imageVersion)
 
         cmds.setAttr("{}.visibility".format(self.cubeTrans), False)
         self.assertFalse(cmds.getAttr("{}.visibility".format(self.cubeTrans)))
@@ -39,7 +43,7 @@ def test_toggleTransVis(self):
         self.assertIn(
             self.cubeRprim,
             self.getVisibleIndex())
-        self.assertSnapshotClose(cubeUnselectedImg)
+        self.assertSnapshotClose(cubeUnselectedImg, self.imageVersion)
 
     def test_toggleShapeVis(self):
         cmds.setAttr("{}.visibility".format(self.cubeShape), False)

diff --git a/...erDelegatePerInstanceInheritedDataTest/baseline/basisCurveInstance_selected.png b/...erDelegatePerInstanceInheritedDataTest/baseline/basisCurveInstance_selected.png
diff --git a/...DelegatePerInstanceInheritedDataTest/baseline/basisCurveInstance_unselected.png b/...DelegatePerInstanceInheritedDataTest/baseline/basisCurveInstance_unselected.png
diff --git a/...gatePerInstanceInheritedDataTest/baseline/defaultMaterialBillboards_default.png b/...gatePerInstanceInheritedDataTest/baseline/defaultMaterialBillboards_default.png
diff --git a/...nstanceInheritedDataTest/baseline/defaultMaterialBillboards_defaultSelected.png b/...nstanceInheritedDataTest/baseline/defaultMaterialBillboards_defaultSelected.png
diff --git a/...heritedDataTest/baseline/lambertDefaultMaterial/basisCurveInstance_selected.png b/...heritedDataTest/baseline/lambertDefaultMaterial/basisCurveInstance_selected.png
diff --git a/...ritedDataTest/baseline/lambertDefaultMaterial/basisCurveInstance_unselected.png b/...ritedDataTest/baseline/lambertDefaultMaterial/basisCurveInstance_unselected.png
diff --git a/...dDataTest/baseline/lambertDefaultMaterial/defaultMaterialBillboards_default.png b/...dDataTest/baseline/lambertDefaultMaterial/defaultMaterialBillboards_default.png
diff --git a/...t/baseline/lambertDefaultMaterial/defaultMaterialBillboards_defaultSelected.png b/...t/baseline/lambertDefaultMaterial/defaultMaterialBillboards_defaultSelected.png
diff --git a/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py b/test/lib/mayaUsd/render/vp2RenderDelegate/testVP2RenderDelegatePerInstanceInheritedData.py
@@ -26,6 +26,7 @@
 from mayaUsd import ufe as mayaUsdUfe
 
 from maya import cmds
+import maya.mel
 import maya.api.OpenMayaRender as omr
 
 from pxr import Usd
@@ -34,7 +35,6 @@
 
 import os
 
-
 class testVP2RenderDelegatePerInstanceInheritedData(imageUtils.ImageDiffingTestCase):
     """
     Tests imaging using the Viewport 2.0 render delegate when using per-instance
@@ -55,15 +55,19 @@ def setUpClass(cls):
 
         cls._testDir = os.path.abspath('.')
 
+        cls._imageVersion = None
+        if maya.mel.eval("defaultShaderName") != "standardSurface1":
+            cls._imageVersion = 'lambertDefaultMaterial'
+
     @classmethod
     def tearDownClass(cls):
         panel = mayaUtils.activeModelPanel()
         cmds.modelEditor(panel, edit=True, useDefaultMaterial=False)
 
-    def assertSnapshotClose(self, imageName, usdVersion=None):
+    def assertSnapshotClose(self, imageName, version=None):
         paths = []
-        if (usdVersion):
-            paths = [usdVersion, imageName]
+        if (version):
+            paths = [version, imageName]
         else:
             paths = [imageName]
 
@@ -72,7 +76,7 @@ def assertSnapshotClose(self, imageName, usdVersion=None):
         imageUtils.snapshot(snapshotImage, width=960, height=540)
         return self.assertImagesClose(baselineImage, snapshotImage)
 
-    def _StartTest(self, testName):
+    def _StartTest(self, testName, version=None):
         cmds.file(force=True, new=True)
         mayaUtils.loadPlugin("mayaUsdPlugin")
         panel = mayaUtils.activeModelPanel()
@@ -82,7 +86,7 @@ def _StartTest(self, testName):
         mayaUtils.createProxyFromFile(testFile)
         globalSelection = ufe.GlobalSelection.get()
         globalSelection.clear()
-        self.assertSnapshotClose('%s_unselected.png' % self._testName)
+        self.assertSnapshotClose('%s_unselected.png' % self._testName, version)
 
     def testPerInstanceInheritedData(self):
         self._StartTest('perInstanceInheritedData')
@@ -138,10 +142,10 @@ def testPerInstanceInheritedDataPartialOverridePxrMtls(self):
     def testPerInstanceInheritedDataPartialOverride(self):
         self._StartTest('inheritedDisplayColor_pxrSurface')
 
-    def testPerInstanceInheriedDataBasisCurves(self):
-        self._StartTest('basisCurveInstance')
+    def testPerInstanceInheritedDataBasisCurves(self):
+        self._StartTest('basisCurveInstance', self._imageVersion)
         cmds.select("|stage|stageShape,/instanced_2")
-        self.assertSnapshotClose('%s_selected.png' % self._testName)
+        self.assertSnapshotClose('%s_selected.png' % self._testName, self._imageVersion)
 
     @unittest.skipUnless("SkipWhenDefaultMaterialActive" in dir(omr.MRenderItem), "Requires new SDK API")
     def testInstanceDefaultMaterial(self):
@@ -151,10 +155,10 @@ def testInstanceDefaultMaterial(self):
         self.assertSnapshotClose('%s_selected.png' % self._testName)
         panel = mayaUtils.activeModelPanel()
         cmds.modelEditor(panel, edit=True, useDefaultMaterial=True)
-        self.assertSnapshotClose('%s_default.png' % self._testName)
+        self.assertSnapshotClose('%s_default.png' % self._testName, self._imageVersion)
         cmds.select("|stage|stageShape,/root/group/billboard_04",
                     "|stage|stageShape,/root/group/flatquad_04")
-        self.assertSnapshotClose('%s_defaultSelected.png' % self._testName)
+        self.assertSnapshotClose('%s_defaultSelected.png' % self._testName, self._imageVersion)
         cmds.modelEditor(panel, edit=True, useDefaultMaterial=False)
         self.assertSnapshotClose('%s_notDefault.png' % self._testName)
 

diff --git a/test/testUtils/mtohUtils.py b/test/testUtils/mtohUtils.py
@@ -37,11 +37,14 @@ def setUpClass(cls):
 
         cls._testDir = os.path.abspath('.')
 
-    def assertSnapshotClose(self, refImage,
+    def assertSnapshotClose(self, refImage, imageVersion=None,
                             maxAvgChannelDiff=\
                                 ImageDiffingTestCase.AVG_CHANNEL_DIFF):
         if not os.path.isabs(refImage):
-            refImage = os.path.join(self._inputDir, refImage)
+            if imageVersion:
+                refImage = os.path.join(self._inputDir, imageVersion, refImage)
+            else:
+                refImage = os.path.join(self._inputDir, refImage)
         super(MtohTestCase, self).assertSnapshotClose(
             refImage, maxAvgChannelDiff=maxAvgChannelDiff)