Merge pull request #1369 from danieldresser-ie/fixAlembicCancelTiming

AlembicSceneTest::testCancel : Loosen timing tolerance

Author: johnhaddon

SConstruct

@@ -3230,6 +3230,7 @@ if doConfigure :
 		alembicTestEnv["ENV"][alembicTestEnv["TEST_LIBRARY_PATH_ENV_VAR"]] += os.pathsep + alembicTestLibPaths
 		alembicTestEnv["ENV"]["PYTHONPATH"] += os.pathsep + "./contrib/IECoreAlembic/python"
 		alembicTest = alembicTestEnv.Command( "contrib/IECoreAlembic/test/IECoreAlembic/results.txt", alembicPythonModule, "$PYTHON $TEST_ALEMBIC_SCRIPT --verbose" )
+		alembicTestEnv.Depends( alembicTest, [ corePythonModule ] )
 		NoCache( alembicTest )
 		alembicTestEnv.Alias( "testAlembic", alembicTest )
 

contrib/IECoreAlembic/test/IECoreAlembic/AlembicSceneTest.py

@@ -1933,7 +1933,7 @@ def backgroundRun():
 		canceller.cancel()
 		thread.join()
 
-		self.assertLess( time.time() - startTime, 0.06 )
+		self.assertLess( time.time() - startTime, 0.1 if IECore.isDebug() else 0.06 )
 		self.assertTrue( cancelled[0] )
 
 	def testIndexedCurveUVs( self ) :