[Bf-blender-cvs] [e21f1136c2d] master: Tests: fix 'ctest -j' running multiple tests at once
Campbell Barton
noreply at git.blender.org
Thu Dec 10 07:20:03 CET 2020
Commit: e21f1136c2dc95ba78b871955e2679b74e42e223
Author: Campbell Barton
Date: Thu Dec 10 17:16:18 2020 +1100
Branches: master
https://developer.blender.org/rBe21f1136c2dc95ba78b871955e2679b74e42e223
Tests: fix 'ctest -j' running multiple tests at once
bl_blendfile_io & bl_blendfile_liblink shared a filename,
which could make these tests fail.
===================================================================
M tests/python/bl_blendfile_io.py
M tests/python/bl_blendfile_liblink.py
===================================================================
diff --git a/tests/python/bl_blendfile_io.py b/tests/python/bl_blendfile_io.py
index 49814ea5902..2c27b60f34e 100644
--- a/tests/python/bl_blendfile_io.py
+++ b/tests/python/bl_blendfile_io.py
@@ -20,7 +20,9 @@ class TestBlendFileSaveLoadBasic(TestHelper):
output_dir = self.args.output_dir
self.ensure_path(output_dir)
- output_path = os.path.join(output_dir, "blendfile.blend")
+
+ # Take care to keep the name unique so multiple test jobs can run at once.
+ output_path = os.path.join(output_dir, "blendfile_io.blend")
orig_data = self.blender_data_to_tuple(bpy.data, "orig_data 1")
diff --git a/tests/python/bl_blendfile_liblink.py b/tests/python/bl_blendfile_liblink.py
index b48deb7bd7b..fc618314216 100644
--- a/tests/python/bl_blendfile_liblink.py
+++ b/tests/python/bl_blendfile_liblink.py
@@ -21,6 +21,7 @@ class TestBlendLibLinkSaveLoadBasic(TestHelper):
output_dir = self.args.output_dir
self.ensure_path(output_dir)
+ # Take care to keep the name unique so multiple test jobs can run at once.
output_path = os.path.join(output_dir, "blendlib.blend")
bpy.ops.wm.save_as_mainfile(filepath=output_path, check_existing=False, compress=False)
More information about the Bf-blender-cvs
mailing list