From a258c5d3253316b947fa1db0e80deb82350b8cd3 Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Mon, 17 Jul 2017 12:14:02 +0200
Subject: [PATCH] Unittests: Make sure layer tests pass with or without
 workspace

---
 tests/python/render_layer/render_layer_common.py             | 1 +
 tests/python/render_layer/test_evaluation_selectability_a.py | 1 +
 tests/python/render_layer/test_evaluation_selectability_b.py | 1 +
 tests/python/render_layer/test_evaluation_selectability_c.py | 1 +
 tests/python/render_layer/test_evaluation_selectability_d.py | 1 +
 tests/python/render_layer/test_evaluation_selectability_e.py | 1 +
 tests/python/render_layer/test_evaluation_visibility_a.py    | 1 +
 tests/python/render_layer/test_evaluation_visibility_b.py    | 1 +
 tests/python/render_layer/test_evaluation_visibility_c.py    | 1 +
 tests/python/render_layer/test_evaluation_visibility_d.py    | 1 +
 tests/python/render_layer/test_evaluation_visibility_e.py    | 1 +
 tests/python/render_layer/test_evaluation_visibility_f.py    | 1 +
 tests/python/render_layer/test_object_copy.py                | 1 +
 tests/python/render_layer/test_object_link_b.py              | 1 +
 tests/python/render_layer/test_operator_context.py           | 4 ++++
 15 files changed, 18 insertions(+)

diff --git a/tests/python/render_layer/render_layer_common.py b/tests/python/render_layer/render_layer_common.py
index f6e16459ed3..1173c1e4f36 100644
--- a/tests/python/render_layer/render_layer_common.py
+++ b/tests/python/render_layer/render_layer_common.py
@@ -747,6 +747,7 @@ class Clay:
 
         layer = self._scene.render_layers.new('Evaluation Test')
         layer.collections.unlink(layer.collections[0])
+        self._scene.render_layers.active = layer
         bpy.context.workspace.render_layer = layer
 
         # remove all other layers
diff --git a/tests/python/render_layer/test_evaluation_selectability_a.py b/tests/python/render_layer/test_evaluation_selectability_a.py
index 6faebac79aa..393f406eefc 100644
--- a/tests/python/render_layer/test_evaluation_selectability_a.py
+++ b/tests/python/render_layer/test_evaluation_selectability_a.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_selectability_b.py b/tests/python/render_layer/test_evaluation_selectability_b.py
index f2a11865d09..ea05710ebcf 100644
--- a/tests/python/render_layer/test_evaluation_selectability_b.py
+++ b/tests/python/render_layer/test_evaluation_selectability_b.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_selectability_c.py b/tests/python/render_layer/test_evaluation_selectability_c.py
index 5ec6d6e7d9c..8487ee1a8af 100644
--- a/tests/python/render_layer/test_evaluation_selectability_c.py
+++ b/tests/python/render_layer/test_evaluation_selectability_c.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_selectability_d.py b/tests/python/render_layer/test_evaluation_selectability_d.py
index 3ce9c07c907..b2a924dd6bc 100644
--- a/tests/python/render_layer/test_evaluation_selectability_d.py
+++ b/tests/python/render_layer/test_evaluation_selectability_d.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_selectability_e.py b/tests/python/render_layer/test_evaluation_selectability_e.py
index df308845292..70ede58cb9e 100644
--- a/tests/python/render_layer/test_evaluation_selectability_e.py
+++ b/tests/python/render_layer/test_evaluation_selectability_e.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_visibility_a.py b/tests/python/render_layer/test_evaluation_visibility_a.py
index a3a6bb261f5..b9f57539330 100644
--- a/tests/python/render_layer/test_evaluation_visibility_a.py
+++ b/tests/python/render_layer/test_evaluation_visibility_a.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_visibility_b.py
index 4f81cd540e2..712cc9bd277 100644
--- a/tests/python/render_layer/test_evaluation_visibility_b.py
+++ b/tests/python/render_layer/test_evaluation_visibility_b.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_visibility_c.py b/tests/python/render_layer/test_evaluation_visibility_c.py
index 6b88f6e3c3a..5e378fb07e3 100644
--- a/tests/python/render_layer/test_evaluation_visibility_c.py
+++ b/tests/python/render_layer/test_evaluation_visibility_c.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_visibility_d.py b/tests/python/render_layer/test_evaluation_visibility_d.py
index b19166bd750..e4f0957bd26 100644
--- a/tests/python/render_layer/test_evaluation_visibility_d.py
+++ b/tests/python/render_layer/test_evaluation_visibility_d.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_visibility_e.py b/tests/python/render_layer/test_evaluation_visibility_e.py
index f9f11cb8f23..33c6d7be111 100644
--- a/tests/python/render_layer/test_evaluation_visibility_e.py
+++ b/tests/python/render_layer/test_evaluation_visibility_e.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_evaluation_visibility_f.py b/tests/python/render_layer/test_evaluation_visibility_f.py
index 497087cb9ca..66948b343cb 100644
--- a/tests/python/render_layer/test_evaluation_visibility_f.py
+++ b/tests/python/render_layer/test_evaluation_visibility_f.py
@@ -26,6 +26,7 @@ class UnitTesting(RenderLayerTesting):
 
         layer = scene.render_layers.new('Visibility Test')
         layer.collections.unlink(layer.collections[0])
+        scene.render_layers.active = layer
         workspace.render_layer = layer
 
         scene_collection_mom = scene.master_collection.collections.new("Mom")
diff --git a/tests/python/render_layer/test_object_copy.py b/tests/python/render_layer/test_object_copy.py
index 69e05d46140..1e6e9e5b889 100644
--- a/tests/python/render_layer/test_object_copy.py
+++ b/tests/python/render_layer/test_object_copy.py
@@ -42,6 +42,7 @@ class UnitTesting(RenderLayerTesting):
             layer.collections.link(subzero)
 
             scene.render_layers.active_index = len(scene.render_layers) - 1
+            bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Fresh new Layer']
 
             if mode == 'DUPLICATE':
                 # assuming the latest layer is the active layer
diff --git a/tests/python/render_layer/test_object_link_b.py b/tests/python/render_layer/test_object_link_b.py
index e0228594be7..b18eb844fc4 100644
--- a/tests/python/render_layer/test_object_link_b.py
+++ b/tests/python/render_layer/test_object_link_b.py
@@ -19,6 +19,7 @@ class UnitTesting(RenderLayerTesting):
         See if we can link objects via bpy.context.scene_collection
         """
         import bpy
+        bpy.context.scene.render_layers.active_index = len(bpy.context.scene.render_layers) - 1
         bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Viewport']
         master_collection = bpy.context.scene_collection
         self.do_object_link(master_collection)
diff --git a/tests/python/render_layer/test_operator_context.py b/tests/python/render_layer/test_operator_context.py
index 05a8957fa20..5055d957551 100644
--- a/tests/python/render_layer/test_operator_context.py
+++ b/tests/python/render_layer/test_operator_context.py
@@ -88,6 +88,10 @@ class UnitTesting(RenderLayerTesting):
         layer.collections.active_index = 3
         self.assertEqual(layer.collections.active.name, 'scorpion')
 
+        # Change active scene layer (do it for workspace too just to don't get mangled in workspace bugs)
+        scene = bpy.context.scene
+        scene.render_layers.active_index = len(scene.render_layers) - 2
+        self.assertEqual(scene.render_layers.active.name, "Viewport")
         bpy.context.workspace.render_layer = bpy.context.scene.render_layers['Viewport']
 
         # old layer