InteractiveRenderTests : Wait longer after stopping render

I wrongly thought that a single `assertCalled()` was sufficient, but there may be several UI thread calls involved in render shutdown.
GafferHQ · Nov 9, 2023 · bf248a4 · bf248a4
1 parent fd1935a
commit bf248a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/python/GafferArnoldTest/InteractiveArnoldRenderTest.py b/python/GafferArnoldTest/InteractiveArnoldRenderTest.py
@@ -742,7 +742,7 @@ def testEditLightGroups( self ) :
 				# that it is no longer rendering.
 
 				script["renderer"]["state"].setValue( script["renderer"].State.Stopped )
-				self.uiThreadCallHandler.assertCalled() # Wait for saving to complete
+				self.uiThreadCallHandler.waitFor( 0.5 ) # Wait for saving to complete
 
 				self.assertEqual( len( script["catalogue"]["images"] ), 1 )
 				self.assertNotIn( "gaffer:isRendering", script["catalogue"]["out"].metadata() )

diff --git a/python/GafferSceneTest/InteractiveRenderTest.py b/python/GafferSceneTest/InteractiveRenderTest.py
@@ -2145,13 +2145,7 @@ def testEditCropWindow( self ) :
 		self.assertEqual( script["catalogue"]["out"].metadata()["gaffer:isRendering"], IECore.BoolData( True ) )
 
 		script["renderer"]["state"].setValue( script["renderer"].State.Stopped )
-		self.uiThreadCallHandler.assertCalled() # Wait for saving to complete
-
-		if script["renderer"].typeName() == "GafferCycles::InteractiveCyclesRender" :
-			# Cycles somehow manages to do stuff after we've deleted the CyclesRenderer.
-			# Wait for it to finish.
-			## \todo Figure out why this is needed, and fix it.
-			self.uiThreadCallHandler.waitFor( 1 )
+		self.uiThreadCallHandler.waitFor( 0.5 ) # Wait for saving to complete
 
 		self.assertNotIn( "gaffer:isRendering", script["catalogue"]["out"].metadata() )