From 89e268c9d9b347f232bade0dbf91086660ebeda5 Mon Sep 17 00:00:00 2001 From: Ilya Grigoriev Date: Sun, 1 Jan 2023 14:20:51 -0800 Subject: [PATCH] Rearrange a few lines in TestEnvironment's `jj_cmd`. Moves all the config that depends on the command number next to each other. --- tests/common/mod.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/common/mod.rs b/tests/common/mod.rs index 5d1a77873..2376b9924 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -64,17 +64,19 @@ impl TestEnvironment { } cmd.env("RUST_BACKTRACE", "1"); cmd.env("HOME", self.home_dir.to_str().unwrap()); - let timestamp = chrono::DateTime::parse_from_rfc3339("2001-02-03T04:05:06+07:00").unwrap(); - let mut command_number = self.command_number.borrow_mut(); - *command_number += 1; cmd.env("JJ_CONFIG", self.config_dir.to_str().unwrap()); - let timestamp = timestamp + chrono::Duration::seconds(*command_number); - cmd.env("JJ_TIMESTAMP", timestamp.to_rfc3339()); cmd.env("JJ_USER", "Test User"); cmd.env("JJ_EMAIL", "test.user@example.com"); - cmd.env("JJ_OP_TIMESTAMP", timestamp.to_rfc3339()); cmd.env("JJ_OP_HOSTNAME", "host.example.com"); cmd.env("JJ_OP_USERNAME", "test-username"); + + let mut command_number = self.command_number.borrow_mut(); + *command_number += 1; + let timestamp = chrono::DateTime::parse_from_rfc3339("2001-02-03T04:05:06+07:00").unwrap(); + let timestamp = timestamp + chrono::Duration::seconds(*command_number); + cmd.env("JJ_TIMESTAMP", timestamp.to_rfc3339()); + cmd.env("JJ_OP_TIMESTAMP", timestamp.to_rfc3339()); + cmd }