Skip to content

Commit b90a0c4

Browse files
Fix end-to-end tests (synapse setup) (matrix-org#7420)
* Update install.sh * Update install.sh * Update develop.yml * Update install.sh * Update develop.yml * Update install.sh * Update install.sh * Work around suspected frozendict bug * Faff around with install-webserver.sh * Actually I don't think these clash anyway * Minor cleanup * Add comments Co-authored-by: Olivier <[email protected]>
1 parent f87b5ee commit b90a0c4

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

test/end-to-end-tests/element/install-webserver.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ cd $BASE_DIR
99
virtualenv -p python3 env
1010
source env/bin/activate
1111

12-
# Having been bitten by pip SSL fail too many times, I don't trust the existing pip
13-
# to be able to --upgrade itself, so grab a new one fresh from source.
14-
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
15-
python get-pip.py
16-
rm get-pip.py
12+
pip install --upgrade pip
13+
14+
# Pin setuptools to work around crash bug in v60
15+
# See https://github.com/vector-im/element-web/issues/20287
16+
pip install setuptools==v59.8.0
1717

1818
pip install ComplexHttpServer
1919

test/end-to-end-tests/synapse/install.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,18 @@ cd $SERVER_DIR
2121
virtualenv -p python3 env
2222
source env/bin/activate
2323

24-
# Having been bitten by pip SSL fail too many times, I don't trust the existing pip
25-
# to be able to --upgrade itself, so grab a new one fresh from source.
26-
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
27-
python get-pip.py
24+
pip install --upgrade pip
25+
26+
# Pin setuptools to work around crash bug in v60
27+
# See https://github.com/vector-im/element-web/issues/20287
28+
pip install setuptools==v59.8.0
2829

29-
pip install --upgrade setuptools
3030
pip install https://codeload.github.com/matrix-org/synapse/zip/$SYNAPSE_BRANCH
31+
32+
# reivilibre: Suspected bug in frozendict 2.1.2 leading to a core dump...
33+
# See https://github.com/vector-im/element-web/issues/20287
34+
pip install frozendict==2.0.2
35+
3136
# apply configuration
3237
pushd env/bin/
3338
cp -r $BASE_DIR/config-templates/$CONFIG_TEMPLATE/. ./

0 commit comments

Comments
 (0)