update ctID to support puppeteer and firefox, #156

phetsims · May 3, 2023 · 146014f · 146014f
1 parent f7fec61
commit 146014f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/js/Gruntfile.js b/js/Gruntfile.js
@@ -89,7 +89,7 @@ module.exports = grunt => {
     'Launches puppeteer clients to run tests for CT with the following options:\n' +
     '--puppeteerClients=number : specify how many puppeteer clients to run with, defaults to 16\n' +
     '--firefoxClients=number : specify how many playwright firefox clients to run with, defaults to 0\n' +
-    '--ctID=string : specify id to give to continuous-loop.html, in URL string, defaults to "Sparky%20Puppeteer"\n' +
+    '--ctID=string : specify id to give to continuous-loop.html, in URL string, defaults to "Sparky". Will have the platform appended like "ID%20Puppeteer"\n' +
     '--serverURL=string : defaults to "https://sparky.colorado.edu/"\n',
     () => {
       const ContinuousServerClient = require( './server/ContinuousServerClient' );

diff --git a/js/config/bayes.pm2.config.js b/js/config/bayes.pm2.config.js
@@ -33,7 +33,7 @@ module.exports = {
       cwd: '/data/share/phet/continuous-testing/ct-chrome-clients/aqua',
       script: 'grunt',
       time: true,
-      args: 'client-server --puppeteerClients=16 --ctID=Bayes%20Puppeteer'
+      args: 'client-server --puppeteerClients=16 --ctID=Bayes'
     }
   ]
 };
diff --git a/js/server/ContinuousServerClient.js b/js/server/ContinuousServerClient.js
@@ -27,7 +27,7 @@ class ContinuousServerClient {
       // How many instances (worker threads) should be created?
       numberOfPuppeteers: 8,
       numberOfFirefoxes: 0,
-      ctID: 'Sparky%20Puppeteer',
+      ctID: 'Sparky',
       serverURL: 'https://sparky.colorado.edu/',
       ...options
     };

diff --git a/js/server/playwrightCTClient.js b/js/server/playwrightCTClient.js
@@ -8,6 +8,7 @@
 const assert = require( 'assert' );
 const playwrightLoad = require( '../../../perennial/js/common/playwrightLoad' );
 const { parentPort } = require( 'worker_threads' ); // eslint-disable-line require-statement-match
+const playwright = require( '../../../perennial/node_modules/playwright' );
 
 process.on( 'SIGINT', () => process.exit() );
 
@@ -22,12 +23,13 @@ process.on( 'SIGINT', () => process.exit() );
   server = server.endsWith( '/' ) ? server : `${server}/`;
 
   // http so we don't need to overhead when running locally
-  const url = `${server}continuous-testing/aqua/html/continuous-loop.html?id=${ctID}`;
+  const url = `${server}continuous-testing/aqua/html/continuous-loop.html?id=${ctID}%20Playwright%20Firefox`;
   const loadingMessage = `Loading ${url}`;
   parentPort && parentPort.postMessage( loadingMessage );
   // console.log( loadingMessage );
 
   const error = await playwrightLoad( url, {
+    testingBrowserCreator: playwright.firefox, // hard coded to firefox at this time
     waitAfterLoad: 10 * 60 * 1000, // 15 minutes
     allowedTimeToLoad: 2 * 60 * 1000,
     gotoTimeout: 1000000000, // a long time

diff --git a/js/server/puppeteerCTClient.js b/js/server/puppeteerCTClient.js
@@ -22,7 +22,7 @@ process.on( 'SIGINT', () => process.exit() );
   server = server.endsWith( '/' ) ? server : `${server}/`;
 
   // http so we don't need to overhead when running locally
-  const url = `${server}continuous-testing/aqua/html/continuous-loop.html?id=${ctID}`;
+  const url = `${server}continuous-testing/aqua/html/continuous-loop.html?id=${ctID}%20Puppeteer`;
   const loadingMessage = `Loading ${url}`;
   parentPort && parentPort.postMessage( loadingMessage );
   // console.log( loadingMessage );