24f19e416e
... and update the BuildRequires on golang to reflect reality. https://bugzilla.redhat.com/show_bug.cgi?id=2263968 Resolves: RHEL-30245
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 6838e9347199e875f9869acd2afa64688161ca11 Mon Sep 17 00:00:00 2001
|
|
From: Debarshi Ray <rishi@fedoraproject.org>
|
|
Date: Tue, 13 Feb 2024 21:56:06 +0100
|
|
Subject: [PATCH] test/system: Unbreak Podman's downstream Fedora CI
|
|
|
|
The paths to bats-assert and bats-support are broken, if bats(1) is
|
|
invoked from any other location than the parent directory of the 'tests'
|
|
directory. eg., Podman's downstream Fedora CI invokes the tests as:
|
|
$ cd /path/to/toolbox/test/system
|
|
$ bats .
|
|
|
|
... and it led to [1]:
|
|
1..306
|
|
# test suite: Set up
|
|
# Missing dependencies
|
|
# Forgot to run 'git submodule init' and 'git submodule update' ?
|
|
# test suite: Tear down
|
|
not ok 1 setup_suite
|
|
# (from function `setup_suite' in test file ./setup_suite.bash, line 33)
|
|
# `return 1' failed
|
|
# bats warning: Executed 1 instead of expected 306 tests
|
|
|
|
Fallout from 2c0960660330dc6be6861502988695f9812c475a
|
|
|
|
[1] https://bugzilla.redhat.com/show_bug.cgi?id=2263968
|
|
|
|
https://github.com/containers/toolbox/pull/1448
|
|
---
|
|
test/system/setup_suite.bash | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/test/system/setup_suite.bash b/test/system/setup_suite.bash
|
|
index 78507d660529..649018f01e96 100644
|
|
--- a/test/system/setup_suite.bash
|
|
+++ b/test/system/setup_suite.bash
|
|
@@ -17,7 +17,7 @@
|
|
|
|
missing_dependencies=false
|
|
|
|
-if [ -f test/system/libs/bats-assert/load.bash ] && [ -f test/system/libs/bats-support/load.bash ]; then
|
|
+if [ -f "$BATS_TEST_DIRNAME/libs/bats-assert/load.bash" ] && [ -f "$BATS_TEST_DIRNAME/libs/bats-support/load.bash" ]; then
|
|
load 'libs/helpers'
|
|
else
|
|
missing_dependencies=true
|
|
--
|
|
2.43.0
|
|
|