[Bf-blender-cvs] [333dc8455f] temp-depsgraph-layers: Fix unittests

[Dalai Felinto]

Commit: 333dc8455fdaaa54be6915911343a8fbe94863b0
Author: Dalai Felinto
Date:   Tue Mar 21 10:51:37 2017 +0100
Branches: temp-depsgraph-layers
https://developer.blender.org/rB333dc8455fdaaa54be6915911343a8fbe94863b0

Fix unittests

depsgraph need its own time to update before we can check results (or set selection)

===================================================================

M	tests/python/render_layer/test_evaluation_selectability_a.py
M	tests/python/render_layer/test_evaluation_selectability_b.py
M	tests/python/render_layer/test_evaluation_selectability_c.py
M	tests/python/render_layer/test_evaluation_selectability_d.py
M	tests/python/render_layer/test_evaluation_visibility_a.py
M	tests/python/render_layer/test_evaluation_visibility_b.py

===================================================================

diff --git a/tests/python/render_layer/test_evaluation_selectability_a.py b/tests/python/render_layer/test_evaluation_selectability_a.py
index b95a9598d8..978e2c7407 100644
--- a/tests/python/render_layer/test_evaluation_selectability_a.py
+++ b/tests/python/render_layer/test_evaluation_selectability_a.py
@@ -38,11 +38,10 @@ class UnitTesting(RenderLayerTesting):
         layer_collection_mom = layer.collections.link(scene_collection_mom)
         layer_collection_kid = layer.collections.link(scene_collection_kid)
 
-        layer_collection_mom.hide = False
+        layer_collection_mom.hide = True
+        bpy.context.scene.update() # update depsgraph
         cube.select_set('SELECT')
 
-        bpy.context.scene.update() # update depsgraph
-        bpy.context.scene.depsgraph.debug_graphviz("/home/guest/tmp/depsgraph.dot")
         self.assertTrue(cube.visible_get(), "Cube should be visible")
         self.assertTrue(cube.select_get(), "Cube should be selected")
 
diff --git a/tests/python/render_layer/test_evaluation_selectability_b.py b/tests/python/render_layer/test_evaluation_selectability_b.py
index 81ddddbb4b..f766235f71 100644
--- a/tests/python/render_layer/test_evaluation_selectability_b.py
+++ b/tests/python/render_layer/test_evaluation_selectability_b.py
@@ -37,8 +37,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer_collection_mom = layer.collections.link(scene_collection_mom)
         layer_collection_kid = layer.collections.link(scene_collection_kid)
-
-        layer_collection_mom.hide = False
+        bpy.context.scene.update() # update depsgraph
         cube.select_set('SELECT')
 
         layer_collection_mom.collections[layer_collection_kid.name].hide = True
diff --git a/tests/python/render_layer/test_evaluation_selectability_c.py b/tests/python/render_layer/test_evaluation_selectability_c.py
index 7d8a83e6f7..2652569010 100644
--- a/tests/python/render_layer/test_evaluation_selectability_c.py
+++ b/tests/python/render_layer/test_evaluation_selectability_c.py
@@ -39,9 +39,9 @@ class UnitTesting(RenderLayerTesting):
         layer_collection_kid = layer.collections.link(scene_collection_kid)
 
         layer_collection_mom.hide = False
+        bpy.context.scene.update() # update depsgraph
         cube.select_set('SELECT')
 
-        bpy.context.scene.update() # update depsgraph
         self.assertTrue(cube.visible_get(), "Cube should be visible")
         self.assertTrue(cube.select_get(), "Cube should be selected")
 
diff --git a/tests/python/render_layer/test_evaluation_selectability_d.py b/tests/python/render_layer/test_evaluation_selectability_d.py
index 76a077b955..2420748e83 100644
--- a/tests/python/render_layer/test_evaluation_selectability_d.py
+++ b/tests/python/render_layer/test_evaluation_selectability_d.py
@@ -39,6 +39,8 @@ class UnitTesting(RenderLayerTesting):
         layer_collection_kid = layer.collections.link(scene_collection_kid)
 
         layer_collection_mom.hide = False
+        bpy.context.scene.update() # update depsgraph
+
         cube.select_set('SELECT')
         layer_collection_mom.collections[layer_collection_kid.name].hide_select = True
 
diff --git a/tests/python/render_layer/test_evaluation_visibility_a.py b/tests/python/render_layer/test_evaluation_visibility_a.py
index ad520c9639..bbc95e63ea 100644
--- a/tests/python/render_layer/test_evaluation_visibility_a.py
+++ b/tests/python/render_layer/test_evaluation_visibility_a.py
@@ -39,8 +39,8 @@ class UnitTesting(RenderLayerTesting):
         layer_collection_mom = layer.collections.link(scene_collection_mom)
         layer_collection_kid = layer.collections.link(scene_collection_kid)
 
-        layer_collection_mom.hide = False
-        layer_collection_kid.hide = True
+        layer_collection_mom.hide = True
+        layer_collection_kid.hide = False
 
         bpy.context.scene.update() # update depsgraph
         self.assertTrue(cube.visible_get(), "Object should be visible")
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_visibility_b.py
index 435fd733e2..b4286915d3 100644
--- a/tests/python/render_layer/test_evaluation_visibility_b.py
+++ b/tests/python/render_layer/test_evaluation_visibility_b.py
@@ -43,7 +43,7 @@ class UnitTesting(RenderLayerTesting):
         layer_collection_kid.hide = True
 
         bpy.context.scene.update() # update depsgraph
-        self.assertFalse(cube.visible_get(), "Object is not invisible")
+        self.assertFalse(cube.visible_get(), "Object should be invisible")
 
 
 # ############################################################