diff --git a/scripts/pit/its/cc-identity-management.js b/scripts/pit/its/cc-identity-management.js index 7265a1f5..a9e5862b 100644 --- a/scripts/pit/its/cc-identity-management.js +++ b/scripts/pit/its/cc-identity-management.js @@ -34,7 +34,7 @@ const {log, err, args, createPage, closePage, takeScreenshot, waitForServerReady log(`Checking that ${app} installed in ${url} is running ...\n`); // When app is not running, localization cannot be enabled - let pageApp = await createPage(arg.headless, true); + let pageApp = await createPage(arg.headless, arg.ignoreHTTPSErrors); await waitForServerReady(pageApp, url); await takeScreenshot(pageApp, __filename, 'app-running'); await closePage(pageApp); @@ -83,7 +83,7 @@ const {log, err, args, createPage, closePage, takeScreenshot, waitForServerReady await takeScreenshot(page, __filename, 'user-created'); log(`Logging in ${app} as ${user} ...\n`); - pageApp = await createPage(arg.headless, true); + pageApp = await createPage(arg.headless, arg.ignoreHTTPSErrors); await waitForServerReady(pageApp, url); await takeScreenshot(pageApp, __filename, `app-${app}-loaded`); await pageApp.getByLabel('Email').fill(user); diff --git a/scripts/pit/its/cc-localization.js b/scripts/pit/its/cc-localization.js index 1e77b7a7..e6d9e851 100644 --- a/scripts/pit/its/cc-localization.js +++ b/scripts/pit/its/cc-localization.js @@ -36,7 +36,7 @@ const { assert } = require('console'); log(`Checking that ${app} installed in ${url} is running ...\n`); // When app is not running, localization cannot be enabled - const pageApp = await createPage(arg.headless, true); + const pageApp = await createPage(arg.headless, arg.ignoreHTTPSErrors); await waitForServerReady(pageApp, url); await takeScreenshot(pageApp, __filename, 'app-running'); await closePage(pageApp); diff --git a/scripts/pit/its/test-utils.js b/scripts/pit/its/test-utils.js index 994fcb41..8da13e77 100644 --- a/scripts/pit/its/test-utils.js +++ b/scripts/pit/its/test-utils.js @@ -67,7 +67,7 @@ async function createPage(headless, ignoreHTTPSErrors) { const page = await context.newPage(); page.on('console', msg => { const text = `${msg.text()} - ${msg.location().url}`.replace(/\s+/g, ' '); - if (!/vaadinPush/.test(text)) out("> CONSOLE:", text, '\n'); + if (!/vaadinPush|favicon.ico/.test(text)) out("> CONSOLE:", text, '\n'); }); page.on('pageerror', e => warn("> JSERROR:", ('' + e).replace(/\s+/g, ' '), '\n')); page.browser = browser; diff --git a/scripts/pit/lib/lib-ccenter.sh b/scripts/pit/lib/lib-ccenter.sh index 62a2197a..26886449 100644 --- a/scripts/pit/lib/lib-ccenter.sh +++ b/scripts/pit/lib/lib-ccenter.sh @@ -156,6 +156,18 @@ runPwTests() { done } +setClusterContext() { + [ "$1" = "$CC_CLUSTER" ] && current=kind-$1 || current=$1 + ns=$2 + H=`kubectl config get-contexts | tr '*' ' ' | awk '{print $1}' | egrep "^$current$"` + [ -z "$H" ] && log "Cluster $current not found in kubectl contexts" && return 1 + runCmd "$TEST" "Setting context to $current" "kubectl config use-context $current" || return 1 + H=`kubectl config current-context` + [ "$H" != "$current" ] && log "Current context is not $current" && return 1 + runCmd "$TEST" "Setting default namespace to $ns" "kubectl config set-context --current --namespace=$ns" || return 1 + kubectl get ns >/dev/null 2>&1 || return 1 +} + ## Main method for running control center runControlCenter() { CLUSTER=${CLUSTER:-$CC_CLUSTER} @@ -167,9 +179,7 @@ runControlCenter() { [ "$CLUSTER" != "$CC_CLUSTER" ] || createKindCluster $CC_CLUSTER $CC_NS || return 1 ## Set the context to the cluster - kubectl config set-context $CLUSTER || return 1 - kubectl config set-context --current --namespace=$CC_NS || return 1 - kubectl get ns >/dev/null 2>&1 || return 1 + setClusterContext "$CLUSTER" "$CC_NS" || return 1 ## Clean up CC from a previous run unless SKIPHELM is set [ -z "$SKIPHELM" ] && uninstallCC $CLUSTER $CC_NS