From eb2a71bf48ddb90d4403121a827a08c9e28cfd89 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Fri, 26 Aug 2022 13:40:20 +1000 Subject: [PATCH] Fix #2159. Disable JUnit in Behave in Blender due to Etree conflicts. --- src/blenderbim/Makefile | 3 +++ src/ifcbimtester/patch/junit.patch | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 src/ifcbimtester/patch/junit.patch diff --git a/src/blenderbim/Makefile b/src/blenderbim/Makefile index de92d2add1..cab460be55 100644 --- a/src/blenderbim/Makefile +++ b/src/blenderbim/Makefile @@ -393,6 +393,9 @@ endif cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/runner_util.patch cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/model_core.py < model_core.patch cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/runner_util.py < runner_util.patch + # See bug #2159 + cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/junit.patch + cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/reporter/junit.py < junit.patch rm -rf dist/working # Required by ids - uh, not any more, but I'm trying it out in the drawing module diff --git a/src/ifcbimtester/patch/junit.patch b/src/ifcbimtester/patch/junit.patch new file mode 100644 index 0000000000..e64043575f --- /dev/null +++ b/src/ifcbimtester/patch/junit.patch @@ -0,0 +1,11 @@ +--- junit-original.py 2022-08-26 13:20:23.148507399 +1000 ++++ junit.py 2022-08-26 13:20:47.087450150 +1000 +@@ -108,7 +108,7 @@ + ElementTree.ElementTree._write(self, file, node, encoding, + namespaces) + +-if hasattr(ElementTree, '_serialize'): ++if hasattr(ElementTree, '_serialize') and False: + # pylint: disable=protected-access + def _serialize_xml2(write, elem, encoding, qnames, namespaces, + orig=ElementTree._serialize_xml):