Skip to content

Commit 5c8ded2

Browse files
committed
test(freshness_checksum): remove unnecessary sleep
We don't rely on mtime anymore for checksum-based fingerprint
1 parent 292a409 commit 5c8ded2

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

tests/testsuite/freshness_checksum.rs

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ use std::thread;
99
use cargo_test_support::prelude::*;
1010
use cargo_test_support::registry::Package;
1111
use cargo_test_support::{
12-
basic_lib_manifest, basic_manifest, is_coarse_mtime, project, rustc_host, rustc_host_env,
13-
sleep_ms, str,
12+
basic_lib_manifest, basic_manifest, project, rustc_host, rustc_host_env, str,
1413
};
1514

1615
use super::death;
@@ -115,9 +114,6 @@ fn rebuild_sub_package_then_while_package() {
115114
"#]])
116115
.run();
117116

118-
if is_coarse_mtime() {
119-
sleep_ms(1000);
120-
}
121117
p.change_file("b/src/lib.rs", "pub fn b() {}");
122118

123119
p.cargo("build -Zchecksum-freshness -pb -v")
@@ -600,7 +596,6 @@ fn rebuild_tests_if_lib_changes() {
600596
.masquerade_as_nightly_cargo(&["checksum-freshness"])
601597
.run();
602598

603-
sleep_ms(1000);
604599
p.change_file("src/lib.rs", "");
605600

606601
p.cargo("build -Zchecksum-freshness -v")
@@ -966,7 +961,6 @@ fn no_rebuild_when_rename_dir() {
966961
// make sure the most recently modified file is `src/lib.rs`, not
967962
// `Cargo.toml`, to expose a historical bug where we forgot to strip the
968963
// `Cargo.toml` path from looking for the package root.
969-
cargo_test_support::sleep_ms(100);
970964
fs::write(p.root().join("src/lib.rs"), "").unwrap();
971965

972966
p.cargo("build -Zchecksum-freshness")
@@ -1510,14 +1504,8 @@ fn bust_patched_dep() {
15101504
p.cargo("build -Zchecksum-freshness")
15111505
.masquerade_as_nightly_cargo(&["checksum-freshness"])
15121506
.run();
1513-
if is_coarse_mtime() {
1514-
sleep_ms(1000);
1515-
}
15161507

15171508
p.change_file("reg1new/src/lib.rs", "// modified");
1518-
if is_coarse_mtime() {
1519-
sleep_ms(1000);
1520-
}
15211509

15221510
p.cargo("build -Zchecksum-freshness -v")
15231511
.masquerade_as_nightly_cargo(&["checksum-freshness"])
@@ -1622,7 +1610,6 @@ fn rebuild_on_mid_build_file_modification() {
16221610

16231611
let t = thread::spawn(move || {
16241612
let socket = server.accept().unwrap().0;
1625-
sleep_ms(1000);
16261613
let mut file = OpenOptions::new()
16271614
.write(true)
16281615
.append(true)
@@ -1741,10 +1728,6 @@ fn dirty_both_lib_and_test() {
17411728
.with_stdout_data("...\n[..]doit assert failure[..]\n...")
17421729
.run();
17431730

1744-
if is_coarse_mtime() {
1745-
// #5918
1746-
sleep_ms(1000);
1747-
}
17481731
// Fix the mistake.
17491732
p.change_file("slib.rs", &slib(1));
17501733

@@ -1783,9 +1766,6 @@ fn script_fails_stay_dirty() {
17831766
p.cargo("build -Zchecksum-freshness")
17841767
.masquerade_as_nightly_cargo(&["checksum-freshness"])
17851768
.run();
1786-
if is_coarse_mtime() {
1787-
sleep_ms(1000);
1788-
}
17891769
p.change_file("helper.rs", r#"pub fn doit() {panic!("Crash!");}"#);
17901770
p.cargo("build -Zchecksum-freshness")
17911771
.masquerade_as_nightly_cargo(&["checksum-freshness"])

0 commit comments

Comments
 (0)