Merge pull request #6095 from johnhaddon/interactiveRenderTestBreaks

InteractiveRenderTest : Don't use node subclasses

Changes.md

@@ -7,6 +7,10 @@ Improvements
 - Light Editor : Added `is_sphere` column for Cycles lights.
 - Windows : Gaffer now uses the TBB memory allocator for significantly better performance.
 
+Breaking Changes
+----------------
+
+- InteractiveRenderTest : Removed `interactiveRenderNodeClass` member and `useNodeClass` argument to `_createInteractiveRender`. All testing is now performed with the InteractiveRender node itself.
 
 1.5.0.0a3 (relative to 1.5.0.0a2)
 =========

python/GafferArnoldTest/InteractiveArnoldRenderTest.py

@@ -55,7 +55,6 @@
 
 class InteractiveArnoldRenderTest( GafferSceneTest.InteractiveRenderTest ) :
 
-	interactiveRenderNodeClass = GafferArnold.InteractiveArnoldRender
 	renderer = "Arnold"
 
 	# Arnold outputs licensing warnings that would cause failures

python/GafferCyclesTest/InteractiveCyclesRenderTest.py

@@ -48,7 +48,6 @@
 
 class InteractiveCyclesRenderTest( GafferSceneTest.InteractiveRenderTest ) :
 
-	interactiveRenderNodeClass = GafferCycles.InteractiveCyclesRender
 	renderer = "Cycles"
 
 	def testSVMRenderWithCPU( self ) :

python/GafferDelightTest/InteractiveDelightRenderTest.py

@@ -47,7 +47,6 @@
 @unittest.skipIf( GafferTest.inCI(), "No license available in cloud" )
 class InteractiveDelightRenderTest( GafferSceneTest.InteractiveRenderTest ) :
 
-	interactiveRenderNodeClass =  GafferDelight.InteractiveDelightRender
 	renderer = "3Delight"
 
 	# Temporarily disable this test (which is implemented in the

python/GafferSceneTest/InteractiveRenderTest.py

@@ -53,9 +53,6 @@
 # rather than GafferScene.InteractiveRender, which we hope to phase out.
 class InteractiveRenderTest( GafferSceneTest.SceneTestCase ) :
 
-	## \todo Phase out InteractiveRender subclasses and just use the `renderer`
-	# field below.
-	interactiveRenderNodeClass = None
 	# Derived classes should set `cls.renderer` to the type of
 	# renderer to be tested.
 	renderer = None
@@ -2175,7 +2172,7 @@ def testRendererOption( self ):
 		script["customOptions"] = GafferScene.CustomOptions()
 		script["customOptions"]["in"].setInput( script["outputs"]["out"] )
 
-		script["renderer"] = self._createInteractiveRender( useNodeClass = False )
+		script["renderer"] = self._createInteractiveRender()
 		script["renderer"]["renderer"].setValue( "" )
 		script["renderer"]["in"].setInput( script["customOptions"]["out"] )
 
@@ -2223,7 +2220,7 @@ def testRendererOptionContext( self ):
 		script["standardOptions"]["options"]["defaultRenderer"]["enabled"].setValue( True )
 		script["standardOptions"]["options"]["defaultRenderer"]["value"].setValue( "${defaultRendererVariable}" )
 
-		script["renderer"] = self._createInteractiveRender( useNodeClass = False )
+		script["renderer"] = self._createInteractiveRender()
 		script["renderer"]["renderer"].setValue( "" )
 		script["renderer"]["in"].setInput( script["standardOptions"]["out"] )
 
@@ -2307,14 +2304,10 @@ def tearDown( self ) :
 	## Should be used in test cases to create an InteractiveRender node
 	# suitably configured for error reporting. If failOnError is
 	# True, then the node's error signal will cause the test to fail.
-	def _createInteractiveRender( self, failOnError = True, useNodeClass = True ) :
-
-		if useNodeClass :
-			assert( issubclass( self.interactiveRenderNodeClass, GafferScene.InteractiveRender ) )
-			node = self.interactiveRenderNodeClass()
-		else :
-			node = GafferScene.InteractiveRender()
-			node["renderer"].setValue( self.renderer )
+	def _createInteractiveRender( self, failOnError = True ) :
+
+		node = GafferScene.InteractiveRender()
+		node["renderer"].setValue( self.renderer )
 
 		if failOnError :