Use homeserver in a worker-scoped fixture (#28848)

* Use homeserver in a worker-scoped fixture Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Switch to TestContainers for manging services in Playwright Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Flip fixture dependency order Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Remove mas dep Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Update matrix-authentication-service in Playwright tests Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * delint Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix SMTP port Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Comments Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Strip ansi from playwright logs to make them more readable Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Actually do the update Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Remove access to homeserver.config.baseUrl field in favour of homeserver.baseUrl Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Use sane default_server_config and specify server.invalid in the specific tests which demand it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix mas run Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * break cycle Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * typo Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * prettier Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Wire up basics of dendriteHomeserver Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix types Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Discard changes to playwright/e2e/settings/device-management.spec.ts * Iterate Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> * Fix bad merge Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --------- Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2025-01-08 12:48:48 +00:00
parent 3e27a0019d
commit 50ac509a01
38 changed files with 854 additions and 764 deletions
--- a/playwright/testcontainers/HomeserverContainer.ts
+++ b/playwright/testcontainers/HomeserverContainer.ts
@@ -6,6 +6,7 @@ Please see LICENSE files in the repository root for full details.
 */

 import { AbstractStartedContainer, GenericContainer } from "testcontainers";
+import { APIRequestContext } from "@playwright/test";

 import { StartedSynapseContainer } from "./synapse.ts";
 import { HomeserverInstance } from "../plugins/homeserver";
@@ -16,4 +17,6 @@ export interface HomeserverContainer<Config> extends GenericContainer {
    start(): Promise<StartedSynapseContainer>;
 }

-export interface StartedHomeserverContainer extends AbstractStartedContainer, HomeserverInstance {}
+export interface StartedHomeserverContainer extends AbstractStartedContainer, HomeserverInstance {
+    setRequest(request: APIRequestContext): void;
+}
--- a/playwright/testcontainers/dendrite.ts
+++ b/playwright/testcontainers/dendrite.ts
@@ -6,7 +6,6 @@ Please see LICENSE files in the repository root for full details.
 */

 import { GenericContainer, Wait } from "testcontainers";
-import { APIRequestContext } from "@playwright/test";
 import * as YAML from "yaml";
 import { set } from "lodash";

@@ -208,11 +207,7 @@ const DEFAULT_CONFIG = {
 export class DendriteContainer extends GenericContainer implements HomeserverContainer<typeof DEFAULT_CONFIG> {
    private config: typeof DEFAULT_CONFIG;

-    constructor(
-        private request: APIRequestContext,
-        image = "matrixdotorg/dendrite-monolith:main",
-        binary = "/usr/bin/dendrite",
-    ) {
+    constructor(image = "matrixdotorg/dendrite-monolith:main", binary = "/usr/bin/dendrite") {
        super(image);

        this.config = deepCopy(DEFAULT_CONFIG);
@@ -254,13 +249,12 @@ export class DendriteContainer extends GenericContainer implements HomeserverCon
            container,
            `http://${container.getHost()}:${container.getMappedPort(8008)}`,
            this.config.client_api.registration_shared_secret,
-            this.request,
        );
    }
 }

 export class PineconeContainer extends DendriteContainer {
-    constructor(request: APIRequestContext) {
-        super(request, "matrixdotorg/dendrite-demo-pinecone:main", "/usr/bin/dendrite-demo-pinecone");
+    constructor() {
+        super("matrixdotorg/dendrite-demo-pinecone:main", "/usr/bin/dendrite-demo-pinecone");
    }
 }
--- a/playwright/testcontainers/synapse.ts
+++ b/playwright/testcontainers/synapse.ts
@@ -141,7 +141,7 @@ export type SynapseConfigOptions = Partial<typeof DEFAULT_CONFIG>;
 export class SynapseContainer extends GenericContainer implements HomeserverContainer<typeof DEFAULT_CONFIG> {
    private config: typeof DEFAULT_CONFIG;

-    constructor(private readonly request: APIRequestContext) {
+    constructor() {
        super(`ghcr.io/element-hq/synapse:${TAG}`);

        this.config = deepCopy(DEFAULT_CONFIG);
@@ -221,23 +221,26 @@ export class SynapseContainer extends GenericContainer implements HomeserverCont
            await super.start(),
            `http://localhost:${port}`,
            this.config.registration_shared_secret,
-            this.request,
        );
    }
 }

 export class StartedSynapseContainer extends AbstractStartedContainer implements StartedHomeserverContainer {
    private adminToken?: string;
+    private request?: APIRequestContext;

    constructor(
        container: StartedTestContainer,
        public readonly baseUrl: string,
        private readonly registrationSharedSecret: string,
-        private readonly request: APIRequestContext,
    ) {
        super(container);
    }

+    public setRequest(request: APIRequestContext): void {
+        this.request = request;
+    }
+
    private async registerUserInternal(
        username: string,
        password: string,
@@ -273,6 +276,7 @@ export class StartedSynapseContainer extends AbstractStartedContainer implements
            deviceId: data.device_id,
            password,
            displayName,
+            username,
        };
    }

@@ -300,6 +304,7 @@ export class StartedSynapseContainer extends AbstractStartedContainer implements
            userId: json.user_id,
            deviceId: json.device_id,
            homeServer: json.home_server,
+            username: userId.slice(1).split(":")[0],
        };
    }

--- a/playwright/testcontainers/utils.ts
+++ b/playwright/testcontainers/utils.ts
@@ -24,6 +24,12 @@ export class ContainerLogger {
        };
    }

+    public async testStarted(testInfo: TestInfo) {
+        for (const container in this.logs) {
+            this.logs[container] = "";
+        }
+    }
+
    public async testFinished(testInfo: TestInfo) {
        if (testInfo.status !== "passed") {
            for (const container in this.logs) {