Skip to content

Commit eb2a71b

Browse files
committed
Fix #2159. Disable JUnit in Behave in Blender due to Etree conflicts.
1 parent 4b4e2e1 commit eb2a71b

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

src/blenderbim/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,9 @@ endif
393393
cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/runner_util.patch
394394
cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/model_core.py < model_core.patch
395395
cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/runner_util.py < runner_util.patch
396+
# See bug #2159
397+
cd dist/working/ && wget https://raw.githubusercontent.com/IfcOpenShell/IfcOpenShell/v0.7.0/src/ifcbimtester/patch/junit.patch
398+
cd dist/working/ && patch ../blenderbim/libs/site/packages/behave/reporter/junit.py < junit.patch
396399
rm -rf dist/working
397400

398401
# Required by ids - uh, not any more, but I'm trying it out in the drawing module

src/ifcbimtester/patch/junit.patch

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- junit-original.py 2022-08-26 13:20:23.148507399 +1000
2+
+++ junit.py 2022-08-26 13:20:47.087450150 +1000
3+
@@ -108,7 +108,7 @@
4+
ElementTree.ElementTree._write(self, file, node, encoding,
5+
namespaces)
6+
7+
-if hasattr(ElementTree, '_serialize'):
8+
+if hasattr(ElementTree, '_serialize') and False:
9+
# pylint: disable=protected-access
10+
def _serialize_xml2(write, elem, encoding, qnames, namespaces,
11+
orig=ElementTree._serialize_xml):

0 commit comments

Comments
 (0)