Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pr: use chrono instead of time in tests #5972 #5973

Merged
merged 1 commit into from
Feb 15, 2024
Merged

pr: use chrono instead of time in tests #5972 #5973

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions tests/by-util/test_pr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@
// spell-checker:ignore (ToDO) Sdivide

use crate::common::util::{TestScenario, UCommand};
use chrono::{DateTime, Duration, Utc};
use std::fs::metadata;
use time::macros::format_description;
use time::Duration;
use time::OffsetDateTime;

const DATE_TIME_FORMAT: &[time::format_description::FormatItem] =
format_description!("[month repr:short] [day] [hour]:[minute] [year]");
const DATE_TIME_FORMAT: &str = "%b %d %H:%M %Y";

fn file_last_modified_time(ucmd: &UCommand, path: &str) -> String {
let tmp_dir_path = ucmd.get_full_fixture_path(path);
Expand All @@ -20,28 +17,28 @@ fn file_last_modified_time(ucmd: &UCommand, path: &str) -> String {
.map(|i| {
i.modified()
.map(|x| {
let date_time: OffsetDateTime = x.into();
date_time.format(&DATE_TIME_FORMAT).unwrap()
let date_time: DateTime<Utc> = x.into();
date_time.format(DATE_TIME_FORMAT).to_string()
})
.unwrap_or_default()
})
.unwrap_or_default()
}

fn all_minutes(from: OffsetDateTime, to: OffsetDateTime) -> Vec<String> {
fn all_minutes(from: DateTime<Utc>, to: DateTime<Utc>) -> Vec<String> {
let to = to + Duration::minutes(1);
// const FORMAT: &str = "%b %d %H:%M %Y";
let mut vec = vec![];
let mut current = from;
while current < to {
vec.push(current.format(&DATE_TIME_FORMAT).unwrap());
vec.push(current.format(DATE_TIME_FORMAT).to_string());
current += Duration::minutes(1);
}
vec
}

fn valid_last_modified_template_vars(from: OffsetDateTime) -> Vec<Vec<(String, String)>> {
all_minutes(from, OffsetDateTime::now_utc())
fn valid_last_modified_template_vars(from: DateTime<Utc>) -> Vec<Vec<(String, String)>> {
all_minutes(from, Utc::now())
.into_iter()
.map(|time| vec![("{last_modified_time}".to_string(), time)])
.collect()
Expand Down Expand Up @@ -257,7 +254,7 @@ fn test_with_suppress_error_option() {
fn test_with_stdin() {
let expected_file_path = "stdin.log.expected";
let mut scenario = new_ucmd!();
let start = OffsetDateTime::now_utc();
let start = Utc::now();
scenario
.pipe_in_fixture("stdin.log")
.args(&["--pages=1:2", "-n", "-"])
Expand Down Expand Up @@ -320,7 +317,7 @@ fn test_with_mpr() {
let expected_test_file_path = "mpr.log.expected";
let expected_test_file_path1 = "mpr1.log.expected";
let expected_test_file_path2 = "mpr2.log.expected";
let start = OffsetDateTime::now_utc();
let start = Utc::now();
new_ucmd!()
.args(&["--pages=1:2", "-m", "-n", test_file_path, test_file_path1])
.succeeds()
Expand All @@ -329,7 +326,7 @@ fn test_with_mpr() {
&valid_last_modified_template_vars(start),
);

let start = OffsetDateTime::now_utc();
let start = Utc::now();
new_ucmd!()
.args(&["--pages=2:4", "-m", "-n", test_file_path, test_file_path1])
.succeeds()
Expand All @@ -338,7 +335,7 @@ fn test_with_mpr() {
&valid_last_modified_template_vars(start),
);

let start = OffsetDateTime::now_utc();
let start = Utc::now();
new_ucmd!()
.args(&[
"--pages=1:2",
Expand Down Expand Up @@ -445,7 +442,7 @@ fn test_with_join_lines_option() {
let test_file_2 = "test.log";
let expected_file_path = "joined.log.expected";
let mut scenario = new_ucmd!();
let start = OffsetDateTime::now_utc();
let start = Utc::now();
scenario
.args(&["+1:2", "-J", "-m", test_file_1, test_file_2])
.run()
Expand Down
Loading