fix quotes in NPM command when node is in .vaadin, improve logs

Author: manolo

scripts/pit/its/cc-install-apps.js

@@ -64,7 +64,7 @@ async function installApp(app, page) {
         await installApp(app, page);
     }
 
-    log(`Waiting for the applications to be available...\n`);
+    log(`Waiting for 2 applications to be available...\n`);
     const selector = 'vaadin-grid-cell-content span[theme="badge success"]';
     await expect(page.locator(selector).nth(0)).toBeVisible({ timeout: 180000 });
     await takeScreenshot(page, __filename, 'app-1-available');

scripts/pit/its/cc-localization.js

@@ -79,7 +79,7 @@ const { assert } = require('console');
     await run(`unzip -d ${downloadsDir} -o ${filePath}`);
     const str = await fs.readFileSync('./downloads/translations.properties', 'utf8');
     assert(str.includes('app.title=Panaderia'));
-    await fs.rmdirSync(downloadsDir, { recursive: true });
+    await fs.rmSync(downloadsDir, { recursive: true });
 
     log(`Testing that preview page: ${previewUrl} is up and running\n`);
     await page.getByRole('button', { name: 'Start preview' }).click();

scripts/pit/its/cc-setup.js

@@ -33,8 +33,8 @@ const {log, run, args, createPage, closePage, takeScreenshot, waitForServerReady
 
     await takeScreenshot(page, __filename, 'password-changed');
 
-    await page.getByLabel('First Name').fill(arg.login);
-    await page.getByLabel('Last Name').fill(arg.login);
+    await page.getByLabel('First Name').fill(arg.login.split('@')[0]);
+    await page.getByLabel('Last Name').fill(arg.login.split('@')[1]);
     await page.getByRole('button', { name: 'Submit' }).click();
     await takeScreenshot(page, __filename, 'user-configured');
 

scripts/pit/its/test-utils.js

@@ -14,6 +14,9 @@ function log(...args) {
 function out(...args) {
   process.stderr.write(`\x1b[2m\x1b[196m${args}\x1b[0m`);
 }
+function warn(...args) {
+  process.stderr.write(`\x1b[2m\x1b[91m${args}\x1b[0m`);
+}
 function err(...args) {
   process.stderr.write(`\x1b[0;31m${args}\x1b[0m`);
 }
@@ -63,7 +66,7 @@ async function createPage(headless, ignoreHTTPSErrors) {
     const context = await browser.newContext({ignoreHTTPSErrors: ignoreHTTPSErrors });
     const page = await context.newPage();
     page.on('console', msg => out("> CONSOLE:", (msg.text() + ' - ' + msg.location().url).replace(/\s+/g, ' '), '\n'));
-    page.on('pageerror', e => err("> PAGEERROR:", ('' + e).replace(/\s+/g, ' '), '\n'));
+    page.on('pageerror', e => warn("> JSERROR:", ('' + e).replace(/\s+/g, ' '), '\n'));
     page.browser = browser;
     return page;
 }
@@ -80,7 +83,7 @@ async function takeScreenshot(page, name, descr) {
   const file = `${screenshots}/${scr}-${cnt}-${descr}.png`;
   await page.waitForTimeout(1000);
   await page.screenshot({ path: file });
-  out(`Screenshot taken: ${file}\n`);
+  out(` 📸 Screenshot taken: ${file}\n`);
 }
 
 // Wait for the server to be ready and to get a valid response
@@ -93,29 +96,31 @@ async function waitForServerReady(page, url, options = {}) {
   log(`Opening ${url}\n`);
   for (let attempt = 0; attempt < maxRetries; attempt++) {
     try {
-      const response = await page.goto(url);
+      const response = await page.goto(url, {timeou: 120000});
       // Check if the response status is not 503
       if (response && response.status() < 400) {
-        out(`Attempt ${attempt} Server is ready and returned a valid response. ${response.status()}\n`);
+        out(` ⏲ Attempt ${attempt} Server is ready and returned a valid response. ${response.status()}\n`);
         return response;
       } else {
-        out(`Attempt ${attempt} Server is not ready yet. ${response.status()}\n`);
+        out(` ⏲ Attempt ${attempt} Server is not ready yet. ${response.status()}\n`);
       }
     } catch (error) {
       if (error.message.includes('net::ERR_CERT_AUTHORITY_INVALID')) {
-        err(`Attempt ${attempt} Server has not a valid certificate, install it for ${url} or use --notls flag\n`);
+        err(` ⏲ Attempt ${attempt} Server has not a valid certificate, install it for ${url} or use --notls flag\n`);
       } else {
-        err(`Attempt ${attempt} Server failed with error: ${error.message}\n`);
+        err(` ⏲ Attempt ${attempt} Server failed with error: ${error.message}\n`);
+      }
+      if (attempt >= 10) {
+        throw new Error(`Server Error ${error}.\n`);
       }
-      throw new Error(`Server Error ${error}.\n`);
     }
     await page.waitForTimeout(retryInterval);
   }
   throw new Error(`Server did not become ready after ${maxRetries} attempts.\n`);
 }
 
 module.exports = {
-  log, out, err,
+  log, out, err, warn,
   run,
   args,
   createPage,

scripts/pit/lib/lib-ccenter.sh

@@ -77,7 +77,7 @@ uninstallCC() {
 }
 
 checkTls() {
-  [ -n "$TEST" ] && return 0
+  [ -n "$TEST" -o -n "$SKIPHELM" ] && return 0
   for i in `kubectl get ingresses -n $CC_NS | grep nginx | awk '{print $1}'`; do
     log "$i"
     H=`kubectl get ingress $i -n $CC_NS -o jsonpath='{.spec.rules[0].host}'`
@@ -90,6 +90,7 @@ checkTls() {
 
 ## Configure secrets for the control-center and the keycloak servers
 installTls() {
+  [ -n "$SKIPHELM" ] && return 0
   [ -z "$CC_KEY" -o -z "$CC_CERT" ] && log "No CC_KEY and CC_CERT provided, skiping TLS installation" && return 0
   [ -n "$CC_FULL" ] && CC_CERT=$CC_FULL
   [ -z "$TEST" ] && log "Installing TLS $CC_TLS for $CC_CONTROL and $CC_AUT" || cmd "## Creating TLS file '$CC_DOMAIN.pem' from envs"

scripts/pit/lib/lib-k8s-kind.sh

@@ -31,22 +31,21 @@ hasSUID() {
 # $1: command
 setSuid() {
   isWindows && return 0
-  for W in "/tmp/$1" `which "$1"`; do
-    hasSUID "$W" && echo "$W" && alias kubectl="$W" && return 0
+  T=/tmp/$1
+  for W in "$T" `which "$1"`; do
+    hasSUID "$W" && echo "$W" && return 0
   done
   R=`realpath $W` || return 1
-  echo "$R"
 
   sudo -n true >/dev/null 2>&1 || log "It's necessary to provide sudo password to run '$1' as root"
   sudo -B true || return 1
-  sudo rm -f /tmp/$1
 
   runCmd "$TEST" "Changing owner to root to: $R" "sudo chown root $R" \
-    && runCmd "$TEST" "Changing set-uid to: $R" "sudo chmod u+s $R" && return 0
+    && runCmd "$TEST" "Changing set-uid to: $R" "sudo chmod u+s $R" && echo "kubectl" && return 0
 
-  runCmd "$TEST" "Coping $R" "sudo cp $R /tmp/$1" \
-    && runCmd "$TEST" "Changing owner to root to: /tmp/$1" "sudo chown root /tmp/$1" \
-    && runCmd "$TEST" "Changing set-uid to: $R" "sudo chmod u+s /tmp/$1" && return 0
+  runCmd "$TEST" "Coping $R" "sudo cp $R $T" \
+    && runCmd "$TEST" "Changing owner to root to: $T" "sudo chown root $T" \
+    && runCmd "$TEST" "Changing set-uid to: $R" "sudo chmod u+s $T" && echo "$T" && return 0
 }
 
 ##
@@ -58,13 +57,12 @@ startPortForward() {
   H=`getPids "kubectl port-forward $2"`
   [ -n "$H" ] && log "Already running k8s port-forward $1 $2 $3 -> $4 with pid $H" && return 0
   [ -z "$TEST" ] && log "Starting k8s port-forward $1 $2 $3 -> $4"
-  [ "$4" -le 1024 ] && setSuid kubectl || return 1
+  [ "$4" -le 1024 ] && K=`setSuid kubectl` || return 1
   bgf="k8s-port-forward-$3-$4.log"
   rm -f "$bgf"
-  [ -x /tmp/kubectl ] && K=/tmp/kubectl || K=kubectl
   runInBackgroundToFile "$K port-forward $2 $4:$3 -n $1" "$bgf"
   sleep 2
-  cat "$bgf" | egrep 'Forwarding from'
+  egrep 'Forwarding from' "$bgf"
 }
 
 ##

scripts/pit/lib/lib-playwright.sh

@@ -13,8 +13,7 @@ isInstalledPlaywright() {
 installPlaywright() {
   _pfile="playwright-"`uname`".out"
   _dir=`dirname "$1"`
-  # @playwright/test
-  (cd "$_dir" && runToFile "'${NPM}' install --no-audit @playwright/test" "$_pfile" "$VERBOSE") || return 1
+  (cd "$_dir" && runToFile "$NPM install --no-audit @playwright/test" "$_pfile" "$VERBOSE") || return 1
   (cd "$_dir" && runToFile "npx playwright install chromium" "$_pfile" "$VERBOSE") || return 1
   isLinux && (cd "$_dir" && runToFile "'${NODE}' ./node_modules/.bin/playwright install-deps chromium" "$_pfile" "$VERBOSE") || true
 }
@@ -44,10 +43,10 @@ runPlaywrightTests() {
   PATH=$PATH runToFile "'$NODE' '$_test_file' $_args" "$_pfile" "$VERBOSE" true
   err=$?
   [ -n "$TEST" ] && return 0
-  H=`grep '> CONSOLE:' "$_pfile" | perl -pe 's/(> CONSOLE: Received xhr.*?feat":).*/$1 .../g'`
+  H=`grep ' > CONSOLE:' "$_pfile" | perl -pe 's/(> CONSOLE: Received xhr.*?feat":).*/$1 .../g'`
   H=`echo "$H" | egrep -v 'Atmosphere|Vaadin push loaded|Websocket successfully opened|Websocket closed|404.*favicon.ico'`
   [ -n "$H" ] && [ "$_mode" = "prod" ] && reportError "Console Warnings in $_mode mode $5" "$H" && echo "$H"
-  H=`grep '> JSERROR:' "$_pfile"`
+  H=`grep ' > JSERROR:' "$_pfile"`
   [ -n "$H" ] && reportError "Console Errors in $_msg" "$H" && echo "$H" && return 1
   H=`tail -15 $_pfile`
   [ $err != 0 ] && reportOutErrors "$_ofile" "Error ($err) running Visual-Test ("`basename $_pfile`")" || echo ">>>> PiT: playwright '$_test_file' done" >> $__file

scripts/pit/lib/lib-utils.sh

@@ -167,7 +167,7 @@ computeNpm() {
   NPM=`which npm`
   NPX=`which npx`
   NODE=`which node`
-  [ -x "$_VNODE/bin/node" -a -f "$_NPMJS" ] && export PATH="$_VNODE/bin:$PATH" && NODE="$_VNODE/bin/node" && NPM="'$NODE' $_NPMJS"
+  [ -x "$_VNODE/bin/node" -a -f "$_NPMJS" ] && export PATH="$_VNODE/bin:$PATH" && NODE="$_VNODE/bin/node" && NPM="'$NODE' '$_NPMJS'"
 }
 
 ## Run a command, and shows a message explaining it
@@ -717,7 +717,7 @@ NODE=$NODE
 Java version: `java -version 2>&1`
 Node version: `"$NODE" --version`
 NPM=$NPM
-Npm version: `"$NPM" --version`
+Npm version: `eval $NPM --version`
 "
 }