From 0b25264375e819b2e8a2dc4c2eda53702a9b0ad1 Mon Sep 17 00:00:00 2001 From: Swann Date: Wed, 2 Dec 2020 14:21:49 +0100 Subject: [PATCH] feat: added a basic test texture --- multi_user/operators.py | 10 ++++++++-- scripts/test_addon.py | 2 +- tests/test_bl_types/test_texture.py | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 tests/test_bl_types/test_texture.py diff --git a/multi_user/operators.py b/multi_user/operators.py index 5493043..1d992de 100644 --- a/multi_user/operators.py +++ b/multi_user/operators.py @@ -23,6 +23,7 @@ import queue import random import shutil import string +import sys import time from operator import itemgetter from pathlib import Path @@ -38,7 +39,7 @@ from replication.exception import NonAuthorizedOperationError from replication.interface import session from . import bl_types, delayable, environment, ui, utils -from .presence import (SessionStatusWidget, renderer, view3d_find) +from .presence import SessionStatusWidget, renderer, view3d_find background_execution_queue = Queue() delayables = [] @@ -195,9 +196,14 @@ class SessionStartOperator(bpy.types.Operator): timout=type_local_config.bl_delay_apply, target_type=type_module_class)) + if bpy.app.version[1] >= 91: + python_binary_path = sys.executable + else: + python_binary_path = bpy.app.binary_path_python + session.configure( factory=bpy_factory, - python_path=bpy.app.binary_path_python, + python_path=python_binary_path, external_update_handling=use_extern_update) if settings.update_method == 'DEPSGRAPH': diff --git a/scripts/test_addon.py b/scripts/test_addon.py index 21dd17b..2f524dd 100644 --- a/scripts/test_addon.py +++ b/scripts/test_addon.py @@ -13,7 +13,7 @@ def main(): if len(sys.argv) > 2: blender_rev = sys.argv[2] else: - blender_rev = "2.90.0" + blender_rev = "2.91.0" try: exit_val = BAT.test_blender_addon(addon_path=addon, blender_revision=blender_rev) diff --git a/tests/test_bl_types/test_texture.py b/tests/test_bl_types/test_texture.py new file mode 100644 index 0000000..462128b --- /dev/null +++ b/tests/test_bl_types/test_texture.py @@ -0,0 +1,24 @@ +import os + +import pytest +from deepdiff import DeepDiff + +import bpy +import random +from multi_user.bl_types.bl_texture import BlTexture + +TEXTURE_TYPES = ['NONE', 'BLEND', 'CLOUDS', 'DISTORTED_NOISE', 'IMAGE', 'MAGIC', 'MARBLE', 'MUSGRAVE', 'NOISE', 'STUCCI', 'VORONOI', 'WOOD'] + +@pytest.mark.parametrize('texture_type', TEXTURE_TYPES) +def test_texture(clear_blend, texture_type): + datablock = bpy.data.textures.new('test', texture_type) + + implementation = BlTexture() + expected = implementation._dump(datablock) + bpy.data.textures.remove(datablock) + + test = implementation._construct(expected) + implementation._load(expected, test) + result = implementation._dump(test) + + assert not DeepDiff(expected, result)