Refactored CI/CD pipeline and updated server shutdown

.github/workflows/ci.yaml

@@ -61,22 +61,21 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Cache Blender
+        id: cache-blender
+        uses: actions/cache@v2
+        with:
+          path: blender.zip
+          key: ${{ runner.os }}-blender-${{ hashFiles('**/lockfiles') }}
+
       - name: Download and extract Blender
+        if: steps.cache-blender.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           Invoke-WebRequest -Uri "https://mirrors.ocf.berkeley.edu/blender/release/Blender3.3/blender-3.3.19-windows-x64.zip" -OutFile "blender.zip"
           Expand-Archive -Path "blender.zip" -DestinationPath .
 
       - name: Run tests
-        shell: bash
+        shell: pwsh
         run: |
-          mkdir -p $MIXER_TEST_OUTPUT
-          $MIXER_PYTHON_3_PATH -m pip install unittest-xml-reporting parameterized unittest2 xmlrunner
-          $MIXER_BLENDER_EXE_PATH --background --python-exit-code 1 --python gitlab/install_mixer.py
-          if [ -f mixer/blender_data/tests/ci.py ]; then
-            exit 0
-          fi
-          $MIXER_BLENDER_EXE_PATH --background --python-exit-code 1 --python mixer/blender_data/tests/ci.py
-          $MIXER_PYTHON_3_PATH -m xmlrunner discover --verbose tests.vrtist -o $MIXER_TEST_OUTPUT
-          $MIXER_PYTHON_3_PATH -m xmlrunner discover --verbose tests.broadcaster -o $MIXER_TEST_OUTPUT
-          $MIXER_PYTHON_3_PATH -m xmlrunner discover --verbose tests.blender -o $MIXER_TEST_OUTPUT
+          ./cicd_test.ps1

cicd_test.ps1

@@ -0,0 +1,16 @@
+# Set the path to the blender directory
+$BLENDER_DIR = "blender-3.3.19-windows-x64"
+
+# Install required python packages
+& "$BLENDER_DIR/3.3/python/bin/python.exe" -m pip install unittest-xml-reporting parameterized unittest2 xmlrunner pytest pytest-timeout
+
+# Run the installation script
+& "$BLENDER_DIR/blender.exe" --background --python-exit-code 1 --python gitlab/install_mixer.py
+
+# Run the test script
+& "$BLENDER_DIR/blender.exe" --background --python-exit-code 1 --python mixer/blender_data/tests/ci.py
+
+# Run the tests and generate XML reports
+# & "$BLENDER_DIR/3.3/python/bin/python.exe" -m xmlrunner discover --verbose tests.vrtist -o logs/tests
+& "$BLENDER_DIR/3.3/python/bin/python.exe" -m xmlrunner discover --verbose tests.broadcaster -o logs/tests
+# & "$BLENDER_DIR/3.3/python/bin/python.exe" -m xmlrunner discover --verbose tests.blender -o logs/tests

mixer/blender_data/attributes.py

@@ -198,7 +198,7 @@ def write_attribute(
                 # f"Attempt to write to non-existent attribute {bl_instance}.{key} : skipped"
                 return
 
-            if not prop.is_readonly:
+            if not prop.is_readonly and not (isinstance(parent, bpy.types.Collection) and key == 'name'):
                 try:
                     setattr(parent, key, value)
                 except TypeError as e:

mixer/broadcaster/apps/server.py

@@ -598,6 +598,17 @@ def run(self, port):
         sock.close()
 
 
+    def shutdown(self):
+        global SHUTDOWN
+        SHUTDOWN = True
+
+        with self._mutex:
+            for connection in list(self._connections.values()):
+                self.handle_client_disconnect(connection)
+
+        logger.info("Server has been shut down")
+
+
 def main():
     global _log_server_updates
     args, args_parser = parse_cli_args()

tests/broadcaster/test_server.py

@@ -202,4 +202,4 @@ def test_client_is_disconnected_when_server_process_is_killed(self):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()