From bf248a4d4e44227ba30455fa43fa6c40a08c663b Mon Sep 17 00:00:00 2001 From: John Haddon Date: Thu, 9 Nov 2023 10:09:05 +0000 Subject: [PATCH] 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. --- python/GafferArnoldTest/InteractiveArnoldRenderTest.py | 2 +- python/GafferSceneTest/InteractiveRenderTest.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/python/GafferArnoldTest/InteractiveArnoldRenderTest.py b/python/GafferArnoldTest/InteractiveArnoldRenderTest.py index cdc4c1931e2..0335eb80eee 100644 --- 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 index 1861b34f7a3..85f28effdf2 100644 --- 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() )