From b90751119ddf8f587a515a86ab6621564fdf8834 Mon Sep 17 00:00:00 2001
From: Fuad Ismail <fuad1502@gmail.com>
Date: Thu, 12 Dec 2024 12:54:58 +0700
Subject: [PATCH] tests/dmesg: use fixed offset time argument in test.
---
src/uu/dmesg/src/time_formatter.rs | 10 ----------
tests/by-util/test_dmesg.rs | 4 ++--
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/uu/dmesg/src/time_formatter.rs b/src/uu/dmesg/src/time_formatter.rs
index b180d0e..5d93068 100644
--- a/src/uu/dmesg/src/time_formatter.rs
+++ b/src/uu/dmesg/src/time_formatter.rs
@@ -118,8 +118,6 @@ impl DeltaFormatter {
}
pub fn parse_datetime(s: &str) -> UResult<DateTime<FixedOffset>> {
- #[cfg(feature = "fixed-boot-time")]
- set_fixed_timezone();
match parse_datetime::parse_datetime(s) {
Ok(date_time) => Ok(date_time),
Err(_) => Err(USimpleError::new(1, format!("invalid time value \"{s}\""))),
@@ -184,11 +182,3 @@ fn boot_time_from_utmpx() -> Option<DateTime<FixedOffset>> {
}
None
}
-
-#[cfg(feature = "fixed-boot-time")]
-static SET_TZ: OnceLock<()> = OnceLock::new();
-
-#[cfg(feature = "fixed-boot-time")]
-fn set_fixed_timezone() {
- *SET_TZ.get_or_init(|| std::env::set_var("TZ", "Asia/Jakarta"))
-}
diff --git a/tests/by-util/test_dmesg.rs b/tests/by-util/test_dmesg.rs
index b7f9b69..d8d6836 100644
--- a/tests/by-util/test_dmesg.rs
+++ b/tests/by-util/test_dmesg.rs
@@ -152,8 +152,8 @@ fn test_since_until() {
new_ucmd!()
.arg("--kmsg-file")
.arg("kmsg.input")
- .arg("--since=\"2024-11-19 17:47:32\"")
- .arg("--until=\"2024-11-19 18:55:52\"")
+ .arg("--since=\"2024-11-19 17:47:32 +0700\"")
+ .arg("--until=\"2024-11-19 18:55:52 +0700\"")
.succeeds()
.stdout_only_fixture("test_since_until.expected");
}