38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
From caf748860860293e010e695d72f6b3b3d8509f8a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Florence Blanc-Renaud <flo@redhat.com>
|
||
|
|
Date: Tue, 2 Mar 2021 08:44:35 +0100
|
||
|
|
Subject: [PATCH] ipatests: use whole date when calling journalctl --since
|
||
|
|
|
||
|
|
The test test_commands.py::TestIPACommand::test_ssh_key_connection
|
||
|
|
is checking the content of the journal using journalctl --since ...
|
||
|
|
but provides only the time, not the whole date with year-month-day.
|
||
|
|
As a consequence, if the test is executed around midnight it may
|
||
|
|
find nothing in the journal because it's looking for logs after 11:50PM,
|
||
|
|
which is a date in the future.
|
||
|
|
|
||
|
|
The fix provides a complete date with year-month-day hours:min:sec.
|
||
|
|
|
||
|
|
Fixes: https://pagure.io/freeipa/issue/8728
|
||
|
|
Reviewed-By: Francois Cami <fcami@redhat.com>
|
||
|
|
---
|
||
|
|
ipatests/test_integration/test_commands.py | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ipatests/test_integration/test_commands.py b/ipatests/test_integration/test_commands.py
|
||
|
|
index 45f642bf2..b7ffb926f 100644
|
||
|
|
--- a/ipatests/test_integration/test_commands.py
|
||
|
|
+++ b/ipatests/test_integration/test_commands.py
|
||
|
|
@@ -642,7 +642,8 @@ class TestIPACommand(IntegrationTest):
|
||
|
|
# start to look at logs a bit before "now"
|
||
|
|
# https://pagure.io/freeipa/issue/8432
|
||
|
|
since = time.strftime(
|
||
|
|
- '%H:%M:%S', (datetime.now() - timedelta(seconds=10)).timetuple()
|
||
|
|
+ '%Y-%m-%d %H:%M:%S',
|
||
|
|
+ (datetime.now() - timedelta(seconds=10)).timetuple()
|
||
|
|
)
|
||
|
|
|
||
|
|
tasks.run_ssh_cmd(
|
||
|
|
--
|
||
|
|
2.29.2
|
||
|
|
|