[Bf-blender-cvs] [ad60283bc87] blender2.8: No more need to alter sys.path in each and every render_layer unit test.
Sybren A. Stüvel
noreply at git.blender.org
Fri Apr 7 17:51:31 CEST 2017
Commit: ad60283bc87ff85332bdfe46a8db06fb1ad03de2
Author: Sybren A. Stüvel
Date: Fri Apr 7 17:50:47 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBad60283bc87ff85332bdfe46a8db06fb1ad03de2
No more need to alter sys.path in each and every render_layer unit test.
I tried the clean way, by setting the PYTHONPATH environment variable for
CTest, using SET (CTEST_ENVIRONMENT blablab), but that didn't seem to
work.
===================================================================
M tests/python/render_layer/CMakeLists.txt
M tests/python/render_layer/test_active_collection.py
M tests/python/render_layer/test_collection_rename.py
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_selectability_e.py
M tests/python/render_layer/test_evaluation_selectability_f.py
M tests/python/render_layer/test_evaluation_visibility_a.py
M tests/python/render_layer/test_evaluation_visibility_b.py
M tests/python/render_layer/test_evaluation_visibility_c.py
M tests/python/render_layer/test_evaluation_visibility_d.py
M tests/python/render_layer/test_evaluation_visibility_e.py
M tests/python/render_layer/test_evaluation_visibility_f.py
M tests/python/render_layer/test_evaluation_visibility_g.py
M tests/python/render_layer/test_evaluation_visibility_h.py
M tests/python/render_layer/test_evaluation_visibility_i.py
M tests/python/render_layer/test_layer_linking.py
M tests/python/render_layer/test_move_above_below_layer_collection_a.py
M tests/python/render_layer/test_move_above_below_layer_collection_b.py
M tests/python/render_layer/test_move_above_below_layer_collection_c.py
M tests/python/render_layer/test_move_above_below_layer_collection_d.py
M tests/python/render_layer/test_move_above_below_layer_collection_e.py
M tests/python/render_layer/test_move_above_below_layer_collection_f.py
M tests/python/render_layer/test_move_above_below_layer_collection_g.py
M tests/python/render_layer/test_move_above_below_layer_collection_h.py
M tests/python/render_layer/test_move_above_below_layer_collection_i.py
M tests/python/render_layer/test_move_above_below_layer_collection_j.py
M tests/python/render_layer/test_move_above_below_layer_collection_k.py
M tests/python/render_layer/test_move_above_below_layer_collection_l.py
M tests/python/render_layer/test_move_above_below_scene_collection_a.py
M tests/python/render_layer/test_move_above_below_scene_collection_b.py
M tests/python/render_layer/test_move_above_below_scene_collection_c.py
M tests/python/render_layer/test_move_above_below_scene_collection_d.py
M tests/python/render_layer/test_move_above_below_scene_collection_e.py
M tests/python/render_layer/test_move_above_below_scene_collection_f.py
M tests/python/render_layer/test_move_above_below_scene_collection_g.py
M tests/python/render_layer/test_move_above_below_scene_collection_h.py
M tests/python/render_layer/test_move_above_below_scene_collection_i.py
M tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py
M tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py
M tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py
M tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py
M tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py
M tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py
M tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py
M tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py
M tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py
M tests/python/render_layer/test_move_into_layer_collection_a.py
M tests/python/render_layer/test_move_into_layer_collection_b.py
M tests/python/render_layer/test_move_into_layer_collection_c.py
M tests/python/render_layer/test_move_into_layer_collection_d.py
M tests/python/render_layer/test_move_into_layer_collection_e.py
M tests/python/render_layer/test_move_into_layer_collection_f.py
M tests/python/render_layer/test_move_into_layer_collection_g.py
M tests/python/render_layer/test_move_into_layer_collection_h.py
M tests/python/render_layer/test_move_into_layer_collection_i.py
M tests/python/render_layer/test_move_into_layer_collection_j.py
M tests/python/render_layer/test_move_into_scene_collection_a.py
M tests/python/render_layer/test_move_into_scene_collection_b.py
M tests/python/render_layer/test_move_into_scene_collection_c.py
M tests/python/render_layer/test_move_into_scene_collection_d.py
M tests/python/render_layer/test_move_into_scene_collection_e.py
M tests/python/render_layer/test_move_into_scene_collection_f.py
M tests/python/render_layer/test_move_into_scene_collection_g.py
M tests/python/render_layer/test_move_into_scene_collection_h.py
M tests/python/render_layer/test_move_into_scene_collection_i.py
M tests/python/render_layer/test_move_into_scene_collection_j.py
M tests/python/render_layer/test_move_into_scene_collection_k.py
M tests/python/render_layer/test_move_into_scene_collection_l.py
M tests/python/render_layer/test_move_into_scene_collection_sync_a.py
M tests/python/render_layer/test_move_into_scene_collection_sync_b.py
M tests/python/render_layer/test_move_into_scene_collection_sync_c.py
M tests/python/render_layer/test_move_into_scene_collection_sync_d.py
M tests/python/render_layer/test_move_into_scene_collection_sync_e.py
M tests/python/render_layer/test_move_into_scene_collection_sync_f.py
M tests/python/render_layer/test_move_into_scene_collection_sync_g.py
M tests/python/render_layer/test_move_into_scene_collection_sync_h.py
M tests/python/render_layer/test_move_into_scene_collection_sync_i.py
M tests/python/render_layer/test_move_into_scene_collection_sync_j.py
M tests/python/render_layer/test_move_into_scene_collection_sync_k.py
M tests/python/render_layer/test_move_into_scene_collection_sync_l.py
M tests/python/render_layer/test_object_add_cylinder.py
M tests/python/render_layer/test_object_add_empty.py
M tests/python/render_layer/test_object_add_no_collection_cylinder.py
M tests/python/render_layer/test_object_add_no_collection_empty.py
M tests/python/render_layer/test_object_add_no_collection_torus.py
M tests/python/render_layer/test_object_add_torus.py
M tests/python/render_layer/test_object_copy.py
M tests/python/render_layer/test_object_delete_a.py
M tests/python/render_layer/test_object_delete_b.py
M tests/python/render_layer/test_object_link_a.py
M tests/python/render_layer/test_object_link_b.py
M tests/python/render_layer/test_object_link_c.py
M tests/python/render_layer/test_operator_context.py
M tests/python/render_layer/test_scene_copy_a.py
M tests/python/render_layer/test_scene_copy_b.py
M tests/python/render_layer/test_scene_copy_c.py
M tests/python/render_layer/test_scene_copy_d.py
M tests/python/render_layer/test_scene_write_read.py
M tests/python/render_layer/test_syncing.py
===================================================================
diff --git a/tests/python/render_layer/CMakeLists.txt b/tests/python/render_layer/CMakeLists.txt
index a6e159f2f96..251a1d1d016 100644
--- a/tests/python/render_layer/CMakeLists.txt
+++ b/tests/python/render_layer/CMakeLists.txt
@@ -50,7 +50,10 @@ set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} --background -noaudio --factory-startup
# ------------------------------------------------------------------------------
macro(RENDER_LAYER_TEST test_name)
+ # Adds ${CMAKE_CURRENT_LIST_DIR} to sys.path so that the tests can import
+ # things from render_layer_common.py
add_test(render_layer_${test_name} ${TEST_BLENDER_EXE}
+ --python-expr "import sys; sys.path.append('${CMAKE_CURRENT_LIST_DIR}')"
--python ${CMAKE_CURRENT_LIST_DIR}/test_${test_name}.py --
--testdir="${TEST_SRC_DIR}/layers"
)
diff --git a/tests/python/render_layer/test_active_collection.py b/tests/python/render_layer/test_active_collection.py
index 37401046181..6e1438ab594 100644
--- a/tests/python/render_layer/test_active_collection.py
+++ b/tests/python/render_layer/test_active_collection.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_collection_rename.py b/tests/python/render_layer/test_collection_rename.py
index f193c4bb3d6..596eea7135d 100644
--- a/tests/python/render_layer/test_collection_rename.py
+++ b/tests/python/render_layer/test_collection_rename.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_selectability_a.py b/tests/python/render_layer/test_evaluation_selectability_a.py
index 10356cc2a5a..c27e1509a2f 100644
--- a/tests/python/render_layer/test_evaluation_selectability_a.py
+++ b/tests/python/render_layer/test_evaluation_selectability_a.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_selectability_b.py b/tests/python/render_layer/test_evaluation_selectability_b.py
index 2c33b5d17df..eb78717ef41 100644
--- a/tests/python/render_layer/test_evaluation_selectability_b.py
+++ b/tests/python/render_layer/test_evaluation_selectability_b.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_selectability_c.py b/tests/python/render_layer/test_evaluation_selectability_c.py
index 848c525694f..9860b9ab048 100644
--- a/tests/python/render_layer/test_evaluation_selectability_c.py
+++ b/tests/python/render_layer/test_evaluation_selectability_c.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_selectability_d.py b/tests/python/render_layer/test_evaluation_selectability_d.py
index 208be462703..0cb9a4278bb 100644
--- a/tests/python/render_layer/test_evaluation_selectability_d.py
+++ b/tests/python/render_layer/test_evaluation_selectability_d.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_selectability_e.py b/tests/python/render_layer/test_evaluation_selectability_e.py
index 9920b917cd3..cffc540aa46 100644
--- a/tests/python/render_layer/test_evaluation_selectability_e.py
+++ b/tests/python/render_layer/test_evaluation_selectability_e.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_selectability_f.py b/tests/python/render_layer/test_evaluation_selectability_f.py
index 78ccf89eac3..c8d00164ab7 100644
--- a/tests/python/render_layer/test_evaluation_selectability_f.py
+++ b/tests/python/render_layer/test_evaluation_selectability_f.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_visibility_a.py b/tests/python/render_layer/test_evaluation_visibility_a.py
index db3d4693410..8a711c5f558 100644
--- a/tests/python/render_layer/test_evaluation_visibility_a.py
+++ b/tests/python/render_layer/test_evaluation_visibility_a.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_visibility_b.py
index 1d6c8582ccd..c291277d140 100644
--- a/tests/python/render_layer/test_evaluation_visibility_b.py
+++ b/tests/python/render_layer/test_evaluation_visibility_b.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_visibility_c.py b/tests/python/render_layer/test_evaluation_visibility_c.py
index 440b7444ff2..e0388ce0ab0 100644
--- a/tests/python/render_layer/test_evaluation_visibility_c.py
+++ b/tests/python/render_layer/test_evaluation_visibility_c.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_visibility_d.py b/tests/python/render_layer/test_evaluation_visibility_d.py
index 37c9f9d001d..97777dd8a79 100644
--- a/tests/python/render_layer/test_evaluation_visibility_d.py
+++ b/tests/python/render_layer/test_evaluation_visibility_d.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_visibility_e.py b/tests/python/render_layer/test_evaluation_visibility_e.py
index a6ec431e9a6..ff86dd94857 100644
--- a/tests/python/render_layer/test_evaluation_visibility_e.py
+++ b/tests/python/render_layer/test_evaluation_visibility_e.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_visibility_f.py b/tests/python/render_layer/test_evaluation_visibility_f.py
index b04bceef5f5..add74634215 100644
--- a/tests/python/render_layer/test_evaluation_visibility_f.py
+++ b/tests/python/render_layer/test_evaluation_visibility_f.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_visibility_g.py b/tests/python/render_layer/test_evaluation_visibility_g.py
index 434ec86707e..c9faf65538e 100644
--- a/tests/python/render_layer/test_evaluation_visibility_g.py
+++ b/tests/python/render_layer/test_evaluation_visibility_g.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_visibility_h.py b/tests/python/render_layer/test_evaluation_visibility_h.py
index 05b77e72842..7785cc0c1a7 100644
--- a/tests/python/render_layer/test_evaluation_visibility_h.py
+++ b/tests/python/render_layer/test_evaluation_visibility_h.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_evaluation_visibility_i.py b/tests/python/render_layer/test_evaluation_visibility_i.py
index 5bc379e3a74..da72c1f33ba 100644
--- a/tests/python/render_layer/test_evaluation_visibility_i.py
+++ b/tests/python/render_layer/test_evaluation_visibility_i.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_layer_linking.py b/tests/python/render_layer/test_layer_linking.py
index 49b2a39edde..5b564922c45 100644
--- a/tests/python/render_layer/test_layer_linking.py
+++ b/tests/python/render_layer/test_layer_linking.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_a.py b/tests/python/render_layer/test_move_above_below_layer_collection_a.py
index b3671175263..16da5a651b7 100644
--- a/tests/python/render_layer/test_move_above_below_layer_collection_a.py
+++ b/tests/python/render_layer/test_move_above_below_layer_collection_a.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_b.py b/tests/python/render_layer/test_move_above_below_layer_collection_b.py
index 990936e86f1..59141ab1aed 100644
--- a/tests/python/render_layer/test_move_above_below_layer_collection_b.py
+++ b/tests/python/render_layer/test_move_above_below_layer_collection_b.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_c.py b/tests/python/render_layer/test_move_above_below_layer_collection_c.py
index 990936e86f1..59141ab1aed 100644
--- a/tests/python/render_layer/test_move_above_below_layer_collection_c.py
+++ b/tests/python/render_layer/test_move_above_below_layer_collection_c.py
@@ -6,7 +6,6 @@ import unittest
import os
import sys
-sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
diff --git a/tests/python/render_layer/test_move_above_below_layer_collection_d.py b/tests/python/render_layer/test_move_above_below_l
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list