From b90a0c443db141920c7f1af94e71ed0b1d78f74e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 20 Dec 2021 19:12:07 -0700 Subject: [PATCH] Fix end-to-end tests (synapse setup) (#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 --- .../end-to-end-tests/element/install-webserver.sh | 10 +++++----- test/end-to-end-tests/synapse/install.sh | 15 ++++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/test/end-to-end-tests/element/install-webserver.sh b/test/end-to-end-tests/element/install-webserver.sh index 5c38a1eea3..7551888f1c 100755 --- a/test/end-to-end-tests/element/install-webserver.sh +++ b/test/end-to-end-tests/element/install-webserver.sh @@ -9,11 +9,11 @@ cd $BASE_DIR virtualenv -p python3 env source env/bin/activate - # Having been bitten by pip SSL fail too many times, I don't trust the existing pip - # to be able to --upgrade itself, so grab a new one fresh from source. - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - python get-pip.py - rm get-pip.py + pip install --upgrade pip + + # Pin setuptools to work around crash bug in v60 + # See https://github.com/vector-im/element-web/issues/20287 + pip install setuptools==v59.8.0 pip install ComplexHttpServer diff --git a/test/end-to-end-tests/synapse/install.sh b/test/end-to-end-tests/synapse/install.sh index 077258072c..b145fb3e1b 100755 --- a/test/end-to-end-tests/synapse/install.sh +++ b/test/end-to-end-tests/synapse/install.sh @@ -21,13 +21,18 @@ cd $SERVER_DIR virtualenv -p python3 env source env/bin/activate -# Having been bitten by pip SSL fail too many times, I don't trust the existing pip -# to be able to --upgrade itself, so grab a new one fresh from source. -curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py -python get-pip.py +pip install --upgrade pip + +# Pin setuptools to work around crash bug in v60 +# See https://github.com/vector-im/element-web/issues/20287 +pip install setuptools==v59.8.0 -pip install --upgrade setuptools pip install https://codeload.github.com/matrix-org/synapse/zip/$SYNAPSE_BRANCH + +# reivilibre: Suspected bug in frozendict 2.1.2 leading to a core dump... +# See https://github.com/vector-im/element-web/issues/20287 +pip install frozendict==2.0.2 + # apply configuration pushd env/bin/ cp -r $BASE_DIR/config-templates/$CONFIG_TEMPLATE/. ./