Fix failing render-layer tests after workpsace commit

14 files changed, 25 insertions, 16 deletions

diff --git a/tests/python/render_layer/render_layer_common.py b/tests/python/render_layer/render_layer_common.py
index ec417a829d6..70bd943557b 100644
--- a/tests/python/render_layer/render_layer_common.py
+++ b/tests/python/render_layer/render_layer_common.py
@@ -747,7 +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
         for layer_iter in self._scene.render_layers:
diff --git a/tests/python/render_layer/test_evaluation_selectability_a.py b/tests/python/render_layer/test_evaluation_selectability_a.py
index c27e1509a2f..4c3ea5fce4b 100644
--- a/tests/python/render_layer/test_evaluation_selectability_a.py
+++ b/tests/python/render_layer/test_evaluation_selectability_a.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_selectability_b.py b/tests/python/render_layer/test_evaluation_selectability_b.py
index eb78717ef41..0c6a1e2dd9c 100644
--- a/tests/python/render_layer/test_evaluation_selectability_b.py
+++ b/tests/python/render_layer/test_evaluation_selectability_b.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_selectability_c.py b/tests/python/render_layer/test_evaluation_selectability_c.py
index 9860b9ab048..b98294da874 100644
--- a/tests/python/render_layer/test_evaluation_selectability_c.py
+++ b/tests/python/render_layer/test_evaluation_selectability_c.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_selectability_d.py b/tests/python/render_layer/test_evaluation_selectability_d.py
index 0cb9a4278bb..651c44da328 100644
--- a/tests/python/render_layer/test_evaluation_selectability_d.py
+++ b/tests/python/render_layer/test_evaluation_selectability_d.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_selectability_e.py b/tests/python/render_layer/test_evaluation_selectability_e.py
index cffc540aa46..633f368ee71 100644
--- a/tests/python/render_layer/test_evaluation_selectability_e.py
+++ b/tests/python/render_layer/test_evaluation_selectability_e.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_visibility_a.py b/tests/python/render_layer/test_evaluation_visibility_a.py
index 8a711c5f558..58e2f12760e 100644
--- a/tests/python/render_layer/test_evaluation_visibility_a.py
+++ b/tests/python/render_layer/test_evaluation_visibility_a.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene.master_collection.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_visibility_b.py
index c291277d140..1e8276cb796 100644
--- a/tests/python/render_layer/test_evaluation_visibility_b.py
+++ b/tests/python/render_layer/test_evaluation_visibility_b.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_visibility_c.py b/tests/python/render_layer/test_evaluation_visibility_c.py
index e0388ce0ab0..92f73d65e1e 100644
--- a/tests/python/render_layer/test_evaluation_visibility_c.py
+++ b/tests/python/render_layer/test_evaluation_visibility_c.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_visibility_d.py b/tests/python/render_layer/test_evaluation_visibility_d.py
index 97777dd8a79..d7beae960a5 100644
--- a/tests/python/render_layer/test_evaluation_visibility_d.py
+++ b/tests/python/render_layer/test_evaluation_visibility_d.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_visibility_e.py b/tests/python/render_layer/test_evaluation_visibility_e.py
index ff86dd94857..f9bb35eb02e 100644
--- a/tests/python/render_layer/test_evaluation_visibility_e.py
+++ b/tests/python/render_layer/test_evaluation_visibility_e.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_evaluation_visibility_f.py b/tests/python/render_layer/test_evaluation_visibility_f.py
index add74634215..e8334c9269c 100644
--- a/tests/python/render_layer/test_evaluation_visibility_f.py
+++ b/tests/python/render_layer/test_evaluation_visibility_f.py
@@ -21,11 +21,12 @@ class UnitTesting(RenderLayerTesting):
         import bpy
 
         scene = bpy.context.scene
+        workspace = bpy.context.workspace
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
         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")
         scene_collection_kid = scene_collection_mom.collections.new("Kid")
diff --git a/tests/python/render_layer/test_object_link_b.py b/tests/python/render_layer/test_object_link_b.py
index 0895a5ef3b5..67c293bd8cf 100644
--- a/tests/python/render_layer/test_object_link_b.py
+++ b/tests/python/render_layer/test_object_link_b.py
@@ -19,7 +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 865e8b7e32a..b025a06847e 100644
--- a/tests/python/render_layer/test_operator_context.py
+++ b/tests/python/render_layer/test_operator_context.py
@@ -88,9 +88,7 @@ class UnitTesting(RenderLayerTesting):
         layer.collections.active_index = 3
         self.assertEqual(layer.collections.active.name, 'scorpion')
 
-        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
         self.assertEqual(bpy.ops.testing.sample(render_layer='Viewport', use_verbose=True), {'FINISHED'})