mirror of
https://github.com/martinvonz/jj.git
synced 2024-12-28 15:34:22 +00:00
d66fcf2ca0
this greatly speeds up the time to run all tests, at the cost of slightly larger recompile times for individual tests. this unfortunately adds the requirement that all tests are listed in `runner.rs` for the crate. to avoid forgetting, i've added a new test that ensures the directory is in sync with the file. ## benchmarks before this change, recompiling all tests took 32-50 seconds and running a single test took 3.5 seconds: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test test_working_copy' Time (mean ± σ): 3.543 s ± 0.168 s [User: 2.597 s, System: 1.262 s] Range (min … max): 3.400 s … 3.847 s 10 runs ``` after this change, recompiling all tests take 4 seconds: ``` ; hyperfine 'touch lib/src/lib.rs ; cargo t --test runner --no-run' Time (mean ± σ): 4.055 s ± 0.123 s [User: 3.591 s, System: 1.593 s] Range (min … max): 3.804 s … 4.159 s 10 runs ``` and running a single test takes about the same: ``` ; hyperfine 'touch lib/src/lib.rs && cargo t --test runner -- test_working_copy' Time (mean ± σ): 4.129 s ± 0.120 s [User: 3.636 s, System: 1.593 s] Range (min … max): 3.933 s … 4.346 s 10 runs ``` about 1.4 seconds of that is the time for the runner, of which .4 is the time for the linker. so there may be room for further improving the times.
115 lines
5 KiB
Rust
115 lines
5 KiB
Rust
// Copyright 2022 The Jujutsu Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use std::path::Path;
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
#[test]
|
|
fn test_checkout() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["describe", "-m", "second"]);
|
|
|
|
// Check out current commit
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["checkout", "@"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Working copy now at: zsuskuln 05ce7118 (empty) (no description set)
|
|
Parent commit : rlvkpnrz 5c52832c (empty) second
|
|
"###);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 05ce7118568d3007efc9163b055f9cb4a6becfde
|
|
◉ 5c52832c3483e0ace06d047a806024984f28f1d7 second
|
|
◉ 69542c1984c1f9d91f7c6c9c9e6941782c944bd9 first
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
|
|
// Can provide a description
|
|
test_env.jj_cmd_ok(&repo_path, &["checkout", "@--", "-m", "my message"]);
|
|
insta::assert_snapshot!(get_log_output(&test_env, &repo_path), @r###"
|
|
@ 1191baaf276e3d0b96b1747e885b3a517be80d6f my message
|
|
│ ◉ 5c52832c3483e0ace06d047a806024984f28f1d7 second
|
|
├─╯
|
|
◉ 69542c1984c1f9d91f7c6c9c9e6941782c944bd9 first
|
|
◉ 0000000000000000000000000000000000000000
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_checkout_not_single_rev() {
|
|
let test_env = TestEnvironment::default();
|
|
test_env.jj_cmd_ok(test_env.env_root(), &["init", "repo", "--git"]);
|
|
let repo_path = test_env.env_root().join("repo");
|
|
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "fourth"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "fifth"]);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "root()..@"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Error: Revset "root()..@" resolved to more than one revision
|
|
Hint: The revset "root()..@" resolved to these revisions:
|
|
royxmykx 2f859371 (empty) (no description set)
|
|
mzvwutvl 5c1afd8b (empty) fifth
|
|
zsuskuln 009f88bf (empty) fourth
|
|
kkmpptxz 3fa8931e (empty) third
|
|
rlvkpnrz 5c52832c (empty) second
|
|
...
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "root()..@-"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Error: Revset "root()..@-" resolved to more than one revision
|
|
Hint: The revset "root()..@-" resolved to these revisions:
|
|
mzvwutvl 5c1afd8b (empty) fifth
|
|
zsuskuln 009f88bf (empty) fourth
|
|
kkmpptxz 3fa8931e (empty) third
|
|
rlvkpnrz 5c52832c (empty) second
|
|
qpvuntsm 69542c19 (empty) first
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "@-|@--"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Error: Revset "@-|@--" resolved to more than one revision
|
|
Hint: The revset "@-|@--" resolved to these revisions:
|
|
mzvwutvl 5c1afd8b (empty) fifth
|
|
zsuskuln 009f88bf (empty) fourth
|
|
"###);
|
|
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["checkout", "none()"]);
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
warning: `jj checkout` is deprecated; use `jj new` instead, which is equivalent
|
|
warning: `jj checkout` will be removed in a future version, and this will be a hard error
|
|
Error: Revset "none()" didn't resolve to any revisions
|
|
"###);
|
|
}
|
|
|
|
fn get_log_output(test_env: &TestEnvironment, cwd: &Path) -> String {
|
|
let template = r#"commit_id ++ " " ++ description"#;
|
|
test_env.jj_cmd_success(cwd, &["log", "-T", template])
|
|
}
|