Merge ~athos-ribeiro/ubuntu/+source/crmsh:dep8-timestamp-fail into ubuntu/+source/crmsh:ubuntu/devel

[Athos Ribeiro]

Fix unit tests which are failing during autopkgtest runs.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/crmsh-dep8/+packages

[Athos Ribeiro (athos-ribeiro)]

This was forwarded to Debian through the Debian bug linked in the LP bug we are fixing with this MP.

[Andreas Hasenack (ahasenack)]

Ok, the pacekamer.log file used in the test has no year in its timestamps:

Apr 03 13:03:34 15sp1-1 pacemaker-controld [1948] (do_state_transition) notice: State transition S_TRANSITION_ENGINE -> S_IDLE | input=I_TE_SUCCESS cause=C_FSA_INTERNAL origin=notify_crmd
Apr 03 13:18:34 15sp1-1 pacemaker-controld [1948] (crm_timer_popped) info: Cluster Recheck Timer (I_PE_CALC) just popped (900000ms)

+1

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: athos-ribeiro, ahasenack
Uploaders: athos-ribeiro, ahasenack
MP auto-approved

review: Approve

[Athos Ribeiro (athos-ribeiro)]

FWIW, this is the dep8 test run results for the PPA linked above:

* Results:
  - crmsh/4.6.0-1ubuntu2~ppa1
    + ✅ crmsh on noble for amd64 @ 10.04.24 21:42:43 Log️ 🗒️
    + ✅ crmsh on noble for arm64 @ 10.04.24 21:24:46 Log️ 🗒️
    + ✅ crmsh on noble for armhf @ 10.04.24 20:44:19 Log️ 🗒️
    + ✅ crmsh on noble for i386 @ 10.04.24 21:17:10 Log️ 🗒️
    + ✅ crmsh on noble for ppc64el @ 10.04.24 20:48:21 Log️ 🗒️
    + ✅ crmsh on noble for s390x @ 10.04.24 21:06:27 Log️ 🗒️

[Athos Ribeiro (athos-ribeiro)]

Uploaded. Thanks, Andreas!

diff --git a/debian/changelog b/debian/changelog
index a3772b9..11dfed4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+crmsh (4.6.0-1ubuntu2) noble; urgency=medium
+
+    - d/p/fix-findln-by-timestamp-test.patch: fix failing unit test.
+      (Closes: #1068562) (LP: #2060536)
+
+ -- Athos Ribeiro <[e-mail]>  Wed, 10 Apr 2024 16:14:45 -0300
+
 crmsh (4.6.0-1ubuntu1) noble; urgency=medium
 
   * Merge with Debian; remaining changes:
diff --git a/debian/patches/fix-findln-by-timestamp-test.patch b/debian/patches/fix-findln-by-timestamp-test.patch
new file mode 100644
index 0000000..14e996c
--- /dev/null
+++ b/debian/patches/fix-findln-by-timestamp-test.patch
@@ -0,0 +1,34 @@
+From ee77de8e8b2f9820303d9d049ad39ccf9fcc6ba3 Mon Sep 17 00:00:00 2001
+From: xin liang <[e-mail]>
+Date: Sun, 7 Apr 2024 09:46:13 +0800
+Subject: [PATCH] Dev: unittest: Adjust unit test
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1068562
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/crmsh/+bug/2060536
+Forwarded: https://github.com/ClusterLabs/crmsh/pull/1379/commits/ee77de8e8b2f9820303d9d049ad39ccf9fcc6ba3
+Last-Update: 2024-04-10
+---
+ test/unittests/test_report_utils.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/test/unittests/test_report_utils.py
++++ b/test/unittests/test_report_utils.py
+@@ -816,7 +816,8 @@
+ 
+     def test_findln_by_timestamp(self):
+         target_time = "Apr 03 13:10"
+-        target_time_stamp = crmutils.parse_to_timestamp(target_time+' 2023')
++        this_year = datetime.datetime.now().year
++        target_time_stamp = crmutils.parse_to_timestamp(target_time+' '+str(this_year))
+         with open('pacemaker.log') as f:
+             data = f.read()
+         constants.STAMP_TYPE = utils.determin_log_format(data)
+@@ -828,7 +829,7 @@
+         assert result_pre_line_stamp < target_time_stamp
+ 
+         target_time = "Apr 03 11:01:19"
+-        target_time_stamp = crmutils.parse_to_timestamp(target_time+' 2023')
++        target_time_stamp = crmutils.parse_to_timestamp(target_time+' '+str(this_year))
+         result_line = utils.findln_by_timestamp(data, target_time_stamp, pacemaker_file_path)
+         result_time = ' '.join(data.split('\n')[result_line-1].split()[:3])
+         self.assertEqual(result_time, target_time)
diff --git a/debian/patches/series b/debian/patches/series
index b77d82f..9a8e2ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 0019-Remove-news-adoc.patch
 0020-Replace-distutils.patch
 0021-Fix-bootstrap-bash.patch
+fix-findln-by-timestamp-test.patch