Commit541ccd9

authored

chore: change e2e testing port (#12751)

1 parent03ab37b commit541ccd9Copy full SHA for 541ccd9

File tree

+14

-16

lines changed

+14

-16

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`// Default port from the server`
`2`		`-exportconstdefaultPort=3000;`
	`2`	`+exportconstcoderPort=process.env.CODER_E2E_PORT`
	`3`	`+ ?Number(process.env.CODER_E2E_PORT)`
	`4`	`+ :3111;`
`3`	`5`	`exportconstprometheusPort=2114;`
`4`	`6`
`5`	`7`	`// Use alternate ports in case we're running in a Coder Workspace.`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@ import type {`
`12`	`12`	`UpdateTemplateMeta,`
`13`	`13`	`}from"api/typesGenerated";`
`14`	`14`	`import{TarWriter}from"utils/tar";`
`15`		`-import{prometheusPort,agentPProfPort}from"./constants";`
`16`		`-import{port}from"./playwright.config";`
	`15`	`+import{agentPProfPort,coderPort,prometheusPort}from"./constants";`
`17`	`16`	`import{`
`18`	`17`	`Agent,`
`19`	`18`	`typeApp,`
`@@ -156,7 +155,7 @@ export const sshIntoWorkspace = async (`
`156`	`155`	`env:{`
`157`	`156`	`...process.env,`
`158`	`157`	`CODER_SESSION_TOKEN:sessionToken,`
`159`		`-CODER_URL:"http://localhost:3000",`
	`158`	+CODER_URL:`http://localhost:${coderPort}`,
`160`	`159`	`},`
`161`	`160`	`});`
`162`	`161`	`cp.on("error",(err)=>reject(err));`
`@@ -304,7 +303,7 @@ export const startAgentWithCommand = async (`
`304`	`303`	`constcp=spawn(command,[...args,"agent","--no-reap"],{`
`305`	`304`	`env:{`
`306`	`305`	`...process.env,`
`307`		`-CODER_AGENT_URL:"http://localhost:"+port,`
	`306`	+CODER_AGENT_URL:`http://localhost:${coderPort}`,
`308`	`307`	`CODER_AGENT_TOKEN:token,`
`309`	`308`	`CODER_AGENT_PPROF_ADDRESS:"127.0.0.1:"+agentPProfPort,`
`310`	`309`	`CODER_AGENT_PROMETHEUS_ADDRESS:"127.0.0.1:"+prometheusPort,`
`@@ -701,7 +700,7 @@ export const updateTemplate = async (`
`701`	`700`	`env:{`
`702`	`701`	`...process.env,`
`703`	`702`	`CODER_SESSION_TOKEN:sessionToken,`
`704`		`-CODER_URL:"http://localhost:3000",`
	`703`	+CODER_URL:`http://localhost:${coderPort}`,
`705`	`704`	`},`
`706`	`705`	`},`
`707`	`706`	`);`

Lines changed: 5 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,6 @@`
`1`	`1`	`import{defineConfig}from"@playwright/test";`
`2`	`2`	`importpathfrom"path";`
`3`		`-import{defaultPort,coderdPProfPort,gitAuth}from"./constants";`
`4`		`-`
`5`		`-exportconstport=process.env.CODER_E2E_PORT`
`6`		`- ?Number(process.env.CODER_E2E_PORT)`
`7`		`- :defaultPort;`
	`3`	`+import{coderPort,coderdPProfPort,gitAuth}from"./constants";`
`8`	`4`
`9`	`5`	`exportconstwsEndpoint=process.env.CODER_E2E_WS_ENDPOINT;`
`10`	`6`
`@@ -35,7 +31,7 @@ export default defineConfig({`
`35`	`31`	`],`
`36`	`32`	`reporter:[["./reporter.ts"]],`
`37`	`33`	`use:{`
`38`		-baseURL:`http://localhost:${port}`,
	`34`	+baseURL:`http://localhost:${coderPort}`,
`39`	`35`	`video:"retain-on-failure",`
`40`	`36`	`...(wsEndpoint`
`41`	`37`	`?{`
`@@ -50,12 +46,12 @@ export default defineConfig({`
`50`	`46`	`}),`
`51`	`47`	`},`
`52`	`48`	`webServer:{`
`53`		-url:`http://localhost:${port}/api/v2/deployment/config`,
	`49`	+url:`http://localhost:${coderPort}/api/v2/deployment/config`,
`54`	`50`	`command:`
`55`	`51`	`go run -tags embed${coderMain} server `+
`56`	`52`	`--global-config $(mktemp -d -t e2e-XXXXXXXXXX) `+
`57`		-`--access-url=http://localhost:${port} `+
`58`		-`--http-address=localhost:${port} `+
	`53`	+`--access-url=http://localhost:${coderPort} `+
	`54`	+`--http-address=localhost:${coderPort} `+
`59`	`55`	`--in-memory --telemetry=false `+
`60`	`56`	`--dangerous-disable-rate-limits `+
`61`	`57`	`--provisioner-daemons 10 `+

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import type {`
`11`	`11`	`importaxiosfrom"axios";`
`12`	`12`	`import*asfsfrom"fs/promises";`
`13`	`13`	`importtype{Writable}from"stream";`
	`14`	`+import{coderdPProfPort}from"./constants";`
`14`	`15`
`15`	`16`	`classCoderReporterimplementsReporter{`
`16`	`17`	`config:FullConfig\|null=null;`
`@@ -119,7 +120,7 @@ const filteredServerLogLines = (chunk: string): string[] =>`
`119`	`120`
`120`	`121`	`constexportDebugPprof=async(outputFile:string)=>{`
`121`	`122`	`constresponse=awaitaxios.get(`
`122`		`-"http://127.0.0.1:6062/debug/pprof/goroutine?debug=1",`
	`123`	+`http://127.0.0.1:${coderdPProfPort}/debug/pprof/goroutine?debug=1`,
`123`	`124`	`);`
`124`	`125`	`if(response.status!==200){`
`125`	`126`	thrownewError(`Error: Received status code${response.status}`);

Comments

(0)