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.
306 lines
13 KiB
Rust
306 lines
13 KiB
Rust
// Copyright 2023 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 crate::common::{get_stderr_string, get_stdout_string, TestEnvironment};
|
|
|
|
#[test]
|
|
fn test_next_simple() {
|
|
// Move from first => second.
|
|
// first
|
|
// |
|
|
// second
|
|
// |
|
|
// third
|
|
//
|
|
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");
|
|
// Create a simple linear history, which we'll traverse.
|
|
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"]);
|
|
// Move to `first`
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "@--"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["next"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: royxmykx f039cf03 (empty) (no description set)
|
|
Parent commit : kkmpptxz 3fa8931e (empty) third
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_next_multiple() {
|
|
// Move from first => fourth.
|
|
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, &["new", "@---"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["next", "2"]);
|
|
// We should now be the child of the fourth commit.
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: yqosqzyt 52a2e8c2 (empty) (no description set)
|
|
Parent commit : zsuskuln 009f88bf (empty) fourth
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_prev_simple() {
|
|
// Move from third => second.
|
|
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"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["prev"]);
|
|
// The working copy commit is now a child of "second".
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: mzvwutvl f7a0f876 (empty) (no description set)
|
|
Parent commit : rlvkpnrz 5c52832c (empty) second
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_prev_multiple_without_root() {
|
|
// Move from fourth => second.
|
|
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"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["prev", "2"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: royxmykx 5647d685 (empty) (no description set)
|
|
Parent commit : rlvkpnrz 5c52832c (empty) second
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_next_exceeding_history() {
|
|
// Try to step beyond the current repos history.
|
|
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, &["edit", "-r", "@--"]);
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["next", "3"]);
|
|
// `jj next` beyond existing history fails.
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Error: No descendant found 3 commits forward
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_next_fails_on_merge_commit() {
|
|
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, &["branch", "c", "left"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["co", "@--"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "c", "right"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "left", "right"]);
|
|
// Try to advance the working copy commit.
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["next"]);
|
|
insta::assert_snapshot!(stderr,@r###"
|
|
Error: Cannot run `jj next` on a merge commit
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_next_fails_on_branching_children_no_stdin() {
|
|
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, &["co", "@--"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["co", "@--"]);
|
|
|
|
// Try to advance the working copy commit.
|
|
let assert = test_env.jj_cmd(&repo_path, &["next"]).assert().code(1);
|
|
let stderr = test_env.normalize_output(&get_stderr_string(&assert));
|
|
insta::assert_snapshot!(stderr,@r###"
|
|
Error: Cannot prompt for input since the output is not connected to a terminal
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_next_fails_on_branching_children_quit_prompt() {
|
|
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, &["co", "@--"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["co", "@--"]);
|
|
|
|
// Try to advance the working copy commit.
|
|
let assert = test_env
|
|
.jj_cmd_stdin(&repo_path, &["next"], "q\n")
|
|
.assert()
|
|
.code(1);
|
|
let stdout = test_env.normalize_output(&get_stdout_string(&assert));
|
|
let stderr = test_env.normalize_output(&get_stderr_string(&assert));
|
|
insta::assert_snapshot!(stdout,@r###"
|
|
ambiguous next commit, choose one to target:
|
|
1: zsuskuln 40a959a0 (empty) third
|
|
2: rlvkpnrz 5c52832c (empty) second
|
|
q: quit the prompt
|
|
enter the index of the commit you want to target:
|
|
"###);
|
|
insta::assert_snapshot!(stderr,@r###"
|
|
Error: ambiguous target commit
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_next_choose_branching_child() {
|
|
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, &["co", "@--"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "third"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["co", "@--"]);
|
|
// Advance the working copy commit.
|
|
let (stdout, stderr) = test_env.jj_cmd_stdin_ok(&repo_path, &["next"], "1\n");
|
|
insta::assert_snapshot!(stdout,@r###"
|
|
ambiguous next commit, choose one to target:
|
|
1: zsuskuln 40a959a0 (empty) third
|
|
2: rlvkpnrz 5c52832c (empty) second
|
|
q: quit the prompt
|
|
enter the index of the commit you want to target:
|
|
"###);
|
|
insta::assert_snapshot!(stderr,@r###"
|
|
Working copy now at: yqosqzyt f9f7101a (empty) (no description set)
|
|
Parent commit : zsuskuln 40a959a0 (empty) third
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_prev_fails_on_merge_commit() {
|
|
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, &["branch", "c", "left"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["co", "@--"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "c", "right"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "left", "right"]);
|
|
// Try to advance the working copy commit.
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["prev"]);
|
|
insta::assert_snapshot!(stderr,@r###"
|
|
Error: Cannot run `jj prev` on a merge commit
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_prev_fails_on_multiple_parents() {
|
|
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, &["branch", "c", "left"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "first"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["co", "@--"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["branch", "c", "right"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "second"]);
|
|
// Create a merge commit, which has two parents.
|
|
test_env.jj_cmd_ok(&repo_path, &["new", "left", "right"]);
|
|
test_env.jj_cmd_ok(&repo_path, &["commit", "-m", "merge"]);
|
|
// Advance the working copy commit.
|
|
let (stdout, stderr) = test_env.jj_cmd_stdin_ok(&repo_path, &["prev"], "2\n");
|
|
insta::assert_snapshot!(stdout,@r###"
|
|
ambiguous prev commit, choose one to target:
|
|
1: zsuskuln edad76e9 right | (empty) second
|
|
2: qpvuntsm 5ae1a6a5 left | (empty) first
|
|
q: quit the prompt
|
|
enter the index of the commit you want to target:
|
|
"###);
|
|
insta::assert_snapshot!(stderr,@r###"
|
|
Working copy now at: yostqsxw a9de0711 (empty) (no description set)
|
|
Parent commit : qpvuntsm 5ae1a6a5 left | (empty) first
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_prev_onto_root_fails() {
|
|
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"]);
|
|
// The root commit is before "first".
|
|
let stderr = test_env.jj_cmd_failure(&repo_path, &["prev", "6"]);
|
|
insta::assert_snapshot!(stderr,@r###"
|
|
Error: No ancestor found 6 commits back
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_prev_editing() {
|
|
// Edit the third commit.
|
|
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"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["prev", "--edit"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: zsuskuln 009f88bf (empty) fourth
|
|
Parent commit : kkmpptxz 3fa8931e (empty) third
|
|
"###);
|
|
}
|
|
|
|
#[test]
|
|
fn test_next_editing() {
|
|
// Edit the second commit.
|
|
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, &["edit", "@--"]);
|
|
let (stdout, stderr) = test_env.jj_cmd_ok(&repo_path, &["next", "--edit"]);
|
|
insta::assert_snapshot!(stdout, @"");
|
|
insta::assert_snapshot!(stderr, @r###"
|
|
Working copy now at: zsuskuln 009f88bf (empty) fourth
|
|
Parent commit : kkmpptxz 3fa8931e (empty) third
|
|
"###);
|
|
}
|