From 50663f486f9a28fb9e3c6b1623ed948539577d68 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 8 Mar 2022 21:57:52 +0000 Subject: [PATCH] caching pip depedencies --- .github/workflows/test.yml | 7 ++++++- test-harness/src/test/kotlin/SmokeTest.kt | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8bba25f..53a2098 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,14 +31,19 @@ jobs: distribution: 'adopt' java-version: '11' + - name: Create pip requirements + run: | + echo "matrix-synapse" > requirements.txt + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: python-version: 3.8 + cache: 'pip' - name: Start synapse server run: | - pip install matrix-synapse + pip install -r requirements.txt curl -sL https://gist.githubusercontent.com/ouchadam/e3ad09ec382bd91a66d88ab575ea7c31/raw/run.sh \ | bash -s -- --no-rate-limit diff --git a/test-harness/src/test/kotlin/SmokeTest.kt b/test-harness/src/test/kotlin/SmokeTest.kt index 4aa34e9..438452a 100644 --- a/test-harness/src/test/kotlin/SmokeTest.kt +++ b/test-harness/src/test/kotlin/SmokeTest.kt @@ -22,7 +22,6 @@ import test.flowTest import test.restoreLoginAndInitialSync import java.util.* -private const val TEST_SERVER_URL_REDIRECT = "https://localhost:8080/" private const val HTTPS_TEST_SERVER_URL = "https://localhost:8080/" @TestMethodOrder(MethodOrderer.OrderAnnotation::class) @@ -122,7 +121,7 @@ private suspend fun createAndRegisterAccount(): TestUser { .register(aUserName, aUser.password, homeServer = HTTPS_TEST_SERVER_URL) result.accessToken shouldNotBeEqualTo null - result.homeServer shouldBeEqualTo HomeServerUrl(TEST_SERVER_URL_REDIRECT) + result.homeServer shouldBeEqualTo HomeServerUrl(HTTPS_TEST_SERVER_URL) result.userId shouldBeEqualTo userId return aUser } @@ -135,7 +134,7 @@ private suspend fun login(user: TestUser) { .login(userName = user.roomMember.id.value, password = user.password) result.accessToken shouldNotBeEqualTo null - result.homeServer shouldBeEqualTo HomeServerUrl(TEST_SERVER_URL_REDIRECT) + result.homeServer shouldBeEqualTo HomeServerUrl(HTTPS_TEST_SERVER_URL) result.userId shouldBeEqualTo user.roomMember.id testMatrix.saveLogin(result)