From 045d538c77709f54f8e901b316084da87a106a4b Mon Sep 17 00:00:00 2001 From: stilobique Date: Tue, 8 Feb 2022 09:39:03 +0100 Subject: [PATCH 1/3] Clean old keep file and update gitignore --- .gitignore | 1 + blender_addon_folder/.keep | 0 2 files changed, 1 insertion(+) delete mode 100644 blender_addon_folder/.keep diff --git a/.gitignore b/.gitignore index 58781b5..6891257 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ ### PyCharm ### .idea/ +.run/ ### Python ### # Byte-compiled / optimized / DLL files diff --git a/blender_addon_folder/.keep b/blender_addon_folder/.keep deleted file mode 100644 index e69de29..0000000 From f74c8295b8d2c6897c6e71c85219e883a6328c69 Mon Sep 17 00:00:00 2001 From: stilobique Date: Tue, 8 Feb 2022 10:35:44 +0100 Subject: [PATCH 2/3] Ignore all emplacement about the venv generated --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6891257..9da9f05 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,5 @@ tests/unreal_sample/Saved **/token.txt # Virtual Environment -tests/venv +**/venv/** venv/ \ No newline at end of file From f92c651c80d522201aeb257df35ca317fce3e5eb Mon Sep 17 00:00:00 2001 From: Jeremy D Date: Wed, 9 Feb 2022 11:58:02 +0100 Subject: [PATCH 3/3] Update and optimize template --- tests/launch_test.sh | 34 +++-------------------- tests/unit_test/test_b3d_install_addon.py | 2 +- tests/utils/blender.py | 2 +- tests/utils/blender_addon.py | 7 +++-- 4 files changed, 10 insertions(+), 35 deletions(-) diff --git a/tests/launch_test.sh b/tests/launch_test.sh index 657dbcf..28d0ce5 100644 --- a/tests/launch_test.sh +++ b/tests/launch_test.sh @@ -1,31 +1,5 @@ -#!/bin/sh - -# To disable the sdt with each command, add ' > /dev/null 2>&1' to redirect all info -# Set all variables -MOUNT_FOLDER="/addon-moderlab" -INSTALL_ADDON="$MOUNT_FOLDER/tests/utils/blender_addon.py" - +#!/bin/bash +MOUNT_FOLDER="addon_moderlab" export FOLDER_TEST=$MOUNT_FOLDER - -# ----- ----- ----- ----- -# From a previous archive generated, install the moderlab plugin -/opt/blender/blender --background --python "$INSTALL_ADDON" -- "$MOUNT_FOLDER" > /dev/null 2>&1 -install_error=$? - -if [ $install_error = 1 ]; then - echo Blender Test Error - echo Exit code is install_error - (exit 1) -else - # ----- ----- ----- ----- - # Launch Blender Test - /opt/blender/blender --background -noaudio --disable-autoexec --addons moderlab_type --python-exit-code 1 --python "$1" -- --verbose - blender_error=$? - - if [ $blender_error = 1 ]; then - echo Blender Test Error - echo Exit code is $blender_error - (exit 1) - fi - -fi +/opt/blender/blender --background --python-exit-code 1 --python "/addon_moderlab/tests/utils/blender_addon.py" > /dev/null 2>&1 || exit 1 +/opt/blender/blender --background -noaudio --disable-autoexec --python-exit-code 1 --python "$1" -- --verbose || exit 1 \ No newline at end of file diff --git a/tests/unit_test/test_b3d_install_addon.py b/tests/unit_test/test_b3d_install_addon.py index 45de677..b3e3b7e 100644 --- a/tests/unit_test/test_b3d_install_addon.py +++ b/tests/unit_test/test_b3d_install_addon.py @@ -13,7 +13,7 @@ class ActivateAddon(unittest.TestCase): @staticmethod def get_folder_name(): """Return the folder name to get the addon name we want activated""" - addon = glob.glob("/addon-moderlab/*/__init__.py", recursive=True) + addon = glob.glob("/addon_moderlab/*/__init__.py", recursive=True) return os.path.basename(os.path.dirname(addon[0])) def test_activate_addon(self): diff --git a/tests/utils/blender.py b/tests/utils/blender.py index c25ef8b..f013c95 100644 --- a/tests/utils/blender.py +++ b/tests/utils/blender.py @@ -18,7 +18,7 @@ def b3d_launch_blender_test(client: docker = docker.from_env(), test: list = Non local_path = os.environ.get('GITHUB_WORKSPACE') else: local_path = os.getcwd() - container_folder = '/addon-moderlab' + container_folder = '/addon_moderlab' volume = [f'{local_path}:{container_folder}'] image_name = tag if test is None: diff --git a/tests/utils/blender_addon.py b/tests/utils/blender_addon.py index b0f21e5..7f80ba5 100644 --- a/tests/utils/blender_addon.py +++ b/tests/utils/blender_addon.py @@ -5,16 +5,17 @@ import bpy dependency = { # 'moderlab_plugin': ['moderlab_plugin.zip', 'Moderlab-Production/BlenderPlugin'], 'moderlab_type': ['moderlab_type.zip', 'Moderlab-Production/BlenderObjectType'], + # 'moderlab_pie': ['moderlab_pie.zip', 'Moderlab-Production/BlenderPieMenu'], # 'uv-packer': ['uv-packer.zip', 'Moderlab-Production/UvPacker'], } -def b3d_install_addon(addon_path: str): +def b3d_install_addon(): for key, value in dependency.items(): - bpy.ops.preferences.addon_install(filepath=f'{addon_path}/{value[0]}') + bpy.ops.preferences.addon_install(filepath=f'/addon_moderlab/{value[0]}') bpy.ops.preferences.addon_enable(module=key) bpy.ops.wm.save_userpref() if __name__ == '__main__': - b3d_install_addon(sys.argv[-1]) + b3d_install_addon()