From 4c5db7d98ca22bde6f4c3fd84e6dfe22c9f46bf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= Date: Wed, 19 Feb 2025 07:23:20 +0100 Subject: [PATCH] tests: don't use upstream's etcd installer --- ...-s-etcd-install-as-it-s-arch-specif.patch} | 25 +++++++++++-------- debian/patches/series | 2 +- debian/tests/unit-test | 3 +++ 3 files changed, 18 insertions(+), 12 deletions(-) rename debian/patches/{0004-Don-t-run-swagger-related-or-modules-tasks-before-te.patch => 0004-tests-no-upstream-s-etcd-install-as-it-s-arch-specif.patch} (57%) diff --git a/debian/patches/0004-Don-t-run-swagger-related-or-modules-tasks-before-te.patch b/debian/patches/0004-tests-no-upstream-s-etcd-install-as-it-s-arch-specif.patch similarity index 57% rename from debian/patches/0004-Don-t-run-swagger-related-or-modules-tasks-before-te.patch rename to debian/patches/0004-tests-no-upstream-s-etcd-install-as-it-s-arch-specif.patch index f21d3e6f..2b2bd6d0 100644 --- a/debian/patches/0004-Don-t-run-swagger-related-or-modules-tasks-before-te.patch +++ b/debian/patches/0004-tests-no-upstream-s-etcd-install-as-it-s-arch-specif.patch @@ -1,30 +1,33 @@ From: =?utf-8?q?S=C3=A9bastien_Delafond?= Date: Mon, 17 Feb 2025 10:11:55 +0100 -Subject: Don't run swagger-related or modules tasks before testing +Subject: tests: no upstream's etcd install as it's arch-specific, + and no swagger-related or modules tasks --- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + Makefile | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile -index d6a81da..550a6c8 100644 +index d6a81da..17362e9 100644 --- a/Makefile +++ b/Makefile -@@ -84,7 +84,7 @@ install: +@@ -84,17 +84,12 @@ install: # go install -v @out=`mktemp`; if ! go install -v > $$out 2>&1; then cat $$out; rm -f $$out; echo "\nBuild failed\n"; exit 1; else rm -f $$out; fi -test: prepare swagger etcd-install ## Run unit tests -+test: etcd-install ## Run unit tests - @echo "\e[33m\e[1mStarting etcd ...\e[0m" - @mkdir -p /tmp/aptly-etcd-data; system/t13_etcd/start-etcd.sh > /tmp/aptly-etcd-data/etcd.log 2>&1 & +- @echo "\e[33m\e[1mStarting etcd ...\e[0m" +- @mkdir -p /tmp/aptly-etcd-data; system/t13_etcd/start-etcd.sh > /tmp/aptly-etcd-data/etcd.log 2>&1 & ++test: ## Run unit tests @echo "\e[33m\e[1mRunning go test ...\e[0m" -@@ -94,7 +94,7 @@ test: prepare swagger etcd-install ## Run unit tests - @rm -f /tmp/aptly-etcd-data/etcd.log + go test -v ./... -gocheck.v=true -coverprofile=unit.out; echo $$? > .unit-test.ret +- @echo "\e[33m\e[1mStopping etcd ...\e[0m" +- @pid=`cat /tmp/etcd.pid`; kill $$pid +- @rm -f /tmp/aptly-etcd-data/etcd.log @ret=`cat .unit-test.ret`; if [ "$$ret" = "0" ]; then echo "\n\e[32m\e[1mUnit Tests SUCCESSFUL\e[0m"; else echo "\n\e[31m\e[1mUnit Tests FAILED\e[0m"; fi; rm -f .unit-test.ret; exit $$ret -system-test: prepare swagger etcd-install ## Run system tests -+system-test: etcd-install ## Run system tests ++system-test: ## Run system tests # build coverage binary go test -v -coverpkg="./..." -c -tags testruncli # Download fixture-db, fixture-pool, etcd.db diff --git a/debian/patches/series b/debian/patches/series index 1b24f2cd..91671892 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ 0001-disable-swagger.patch 0002-disable-new-azure-sdk.patch 0003-Revert-fix-empty-mirror-check.patch -0004-Don-t-run-swagger-related-or-modules-tasks-before-te.patch +0004-tests-no-upstream-s-etcd-install-as-it-s-arch-specif.patch diff --git a/debian/tests/unit-test b/debian/tests/unit-test index cc14cb3c..07f255cb 100755 --- a/debian/tests/unit-test +++ b/debian/tests/unit-test @@ -11,4 +11,7 @@ set -eux rm ${APTLY_SRC_DIR}/s3/server_test.go rm ${APTLY_SRC_DIR}/s3/public_test.go +# upstream's etcd fixture is arch-specific +rm ${APTLY_SRC_DIR}/database/etcddb/database_test.go + make -C $APTLY_SRC_DIR test