33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
|
From e49669a0dde7e3a9123925347fbf3234602371ee Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
|
||
|
|
Date: Mon, 31 Jan 2022 13:45:15 +0100
|
||
|
|
Subject: [PATCH] Prevent fails of test_ds_misc.sh
|
||
|
|
|
||
|
|
The SOURCE_DATE_EPOCH environment variable is effective only when it's
|
||
|
|
set to a value that's older than mtime of the processed file. See the
|
||
|
|
implementation in ds_sds_compose_add_component_internal in src/DS/sds.c.
|
||
|
|
However, the file in our test suite has originally been created before
|
||
|
|
(in 2019) and this mtime can be used when a tarball is produced. To
|
||
|
|
avoid the test failing, we can modify the mtime using the touch command
|
||
|
|
just before we run the tests.
|
||
|
|
---
|
||
|
|
tests/DS/test_ds_misc.sh | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tests/DS/test_ds_misc.sh b/tests/DS/test_ds_misc.sh
|
||
|
|
index 159007518..cffbef303 100755
|
||
|
|
--- a/tests/DS/test_ds_misc.sh
|
||
|
|
+++ b/tests/DS/test_ds_misc.sh
|
||
|
|
@@ -269,6 +269,8 @@ function test_source_date_epoch() {
|
||
|
|
local timestamp="2020-03-05T12:09:37"
|
||
|
|
export SOURCE_DATE_EPOCH="1583410177"
|
||
|
|
export TZ=UTC
|
||
|
|
+ # ensure the file mtime is always newer than the $timestamp
|
||
|
|
+ touch -c "$xccdf"
|
||
|
|
$OSCAP ds sds-compose "$xccdf" "$result"
|
||
|
|
assert_exists 3 '//ds:component[@timestamp="'$timestamp'"]'
|
||
|
|
rm -f "$result"
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|