Skip to content

Commit 2591571

Browse files
committed
Stop using Config for tempdir-as-a-service in build_stamp tests
1 parent 40c2ca9 commit 2591571

File tree

1 file changed

+10
-14
lines changed
  • src/bootstrap/src/utils/build_stamp

1 file changed

+10
-14
lines changed

src/bootstrap/src/utils/build_stamp/tests.rs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
use std::path::PathBuf;
22

3-
use crate::{BuildStamp, Config, Flags};
3+
use tempfile::TempDir;
44

5-
fn temp_dir() -> PathBuf {
6-
let config =
7-
Config::parse(Flags::parse(&["check".to_owned(), "--config=/does/not/exist".to_owned()]));
8-
config.tempdir()
9-
}
5+
use crate::{BuildStamp, Config, Flags};
106

117
#[test]
128
#[should_panic(expected = "prefix can not start or end with '.'")]
139
fn test_with_invalid_prefix() {
14-
let dir = temp_dir();
15-
BuildStamp::new(&dir).with_prefix(".invalid");
10+
let dir = TempDir::new().unwrap();
11+
BuildStamp::new(dir.path()).with_prefix(".invalid");
1612
}
1713

1814
#[test]
1915
#[should_panic(expected = "prefix can not start or end with '.'")]
2016
fn test_with_invalid_prefix2() {
21-
let dir = temp_dir();
22-
BuildStamp::new(&dir).with_prefix("invalid.");
17+
let dir = TempDir::new().unwrap();
18+
BuildStamp::new(dir.path()).with_prefix("invalid.");
2319
}
2420

2521
#[test]
2622
fn test_is_up_to_date() {
27-
let dir = temp_dir();
23+
let dir = TempDir::new().unwrap();
2824

29-
let mut build_stamp = BuildStamp::new(&dir).add_stamp("v1.0.0");
25+
let mut build_stamp = BuildStamp::new(dir.path()).add_stamp("v1.0.0");
3026
build_stamp.write().unwrap();
3127

3228
assert!(
@@ -45,9 +41,9 @@ fn test_is_up_to_date() {
4541

4642
#[test]
4743
fn test_with_prefix() {
48-
let dir = temp_dir();
44+
let dir = TempDir::new().unwrap();
4945

50-
let stamp = BuildStamp::new(&dir).add_stamp("v1.0.0");
46+
let stamp = BuildStamp::new(dir.path()).add_stamp("v1.0.0");
5147
assert_eq!(stamp.path.file_name().unwrap(), ".stamp");
5248

5349
let stamp = stamp.with_prefix("test");

0 commit comments

Comments
 (0)