From fc6fbec32f14df956bd325b2c1a39fbb81c47d07 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Mon, 11 Jan 2021 14:28:12 +0100 Subject: [PATCH] test/image: Fix test cases directory path in doc and code The directory with image-tests test cases has been renamed from `cases` to `manifests`. This has not been previously reflected in the test/README.md and osbuild-image-tests code. osbuild-image-tests hardcodes the test cases directory path and uses it in case no test case are passed to it on the command line. Since the image_tests.sh CI test case looks for image-tests test cases in the correct directory and passes the relevant ones to osbuild-image-tests, the CI didn't detect this issue. Running osbuild-images-tests without any argument and let it run all test cases from the default test cases directory as part of CI probably does not make sense. Due to this reason, I'm not adding any new test. Signed-off-by: Tomas Hozza --- cmd/osbuild-image-tests/constants/constants.go | 2 +- test/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/osbuild-image-tests/constants/constants.go b/cmd/osbuild-image-tests/constants/constants.go index 2892c408b..0e54bbf92 100644 --- a/cmd/osbuild-image-tests/constants/constants.go +++ b/cmd/osbuild-image-tests/constants/constants.go @@ -31,7 +31,7 @@ var TestPaths = struct { }{ ImageInfo: "/usr/libexec/osbuild-composer-test/image-info", PrivateKey: "/usr/share/tests/osbuild-composer/keyring/id_rsa", - TestCasesDirectory: "/usr/share/tests/osbuild-composer/cases", + TestCasesDirectory: "/usr/share/tests/osbuild-composer/manifests", UserData: "/usr/share/tests/osbuild-composer/cloud-init/user-data", MetaData: "/usr/share/tests/osbuild-composer/cloud-init/meta-data", AzureDeploymentTemplate: "/usr/share/tests/osbuild-composer/azure/deployment-template.json", diff --git a/test/README.md b/test/README.md index 6e3be9ec9..d04571cea 100644 --- a/test/README.md +++ b/test/README.md @@ -60,7 +60,7 @@ tests, see `.github/workflows/tests.yml`. ## Image tests -In the `test/data/cases` directory, sample image builds and their tests are +In the `test/data/manifests` directory, sample image builds and their tests are collected for the various distros, architectures, configuration we support. Each test case describes how the image is built, the expected osbuild