From 5d15bdac5c7c2ee72f768f0a5fd6ac8715711c13 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 7 Oct 2021 09:22:41 +0200 Subject: [PATCH] fmf: Dependency installation robustification Sync some improvements from cockpit-machines: * Unbreak running `tmt` in local trees with an already existing ./bots symlink. * Don't install all NPM packages, only chrome-remote-interface and sizzle. * Disable detection of affected tests, taking too long for real projects. --- test/browser/run-test.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/browser/run-test.sh b/test/browser/run-test.sh index a3c7585..97bdcbd 100755 --- a/test/browser/run-test.sh +++ b/test/browser/run-test.sh @@ -4,11 +4,21 @@ set -eux # tests need cockpit's bots/ libraries and test infrastructure cd $SOURCE git init +rm -f bots # common local case: existing bots symlink make bots test/common -# only install a subset to save time/space -rm -f package-lock.json # otherwise the command below installs *everything*, argh -npm install chrome-remote-interface sizzle +# support running from clean git tree +if [ ! -d node_modules/chrome-remote-interface ]; then + # copy package.json temporarily otherwise npm might try to install the dependencies from it + rm -f package-lock.json # otherwise the command below installs *everything*, argh + mv package.json .package.json + # only install a subset to save time/space + npm install chrome-remote-interface sizzle + mv .package.json package.json +fi + +# disable detection of affected tests; testing takes too long as there is no parallelization +mv .git dot-git . /etc/os-release export TEST_OS="${ID}-${VERSION_ID/./-}"