Skip to content

Commit 824eb89

Browse files
committed
Use separate test for commands
- Remove unix only test
1 parent a630d21 commit 824eb89

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

tests/buildtest/inside_docker.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@ static CONTAINER_PREFIX: &str = "/outside";
1212
#[test]
1313
#[cfg(unix)]
1414
fn test_hello_world() {
15-
// regression test for https://github.com/rust-lang/rustwide/issues/30
16-
let already_present = Path::new("docker").exists();
17-
if !already_present {
18-
std::fs::create_dir("docker").unwrap();
19-
}
2015
execute("buildtest::test_hello_world").unwrap();
21-
if !already_present {
22-
std::fs::remove_dir("docker").unwrap();
23-
}
2416
}
2517

2618
fn execute(test: &str) -> Result<(), Error> {

tests/issue_30.rs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
use failure::Error;
2+
use rustwide::cmd::Command;
3+
use rustwide::WorkspaceBuilder;
4+
5+
const USER_AGENT: &str = "rustwide-tests (https://github.com/rust-lang/rustwide)";
6+
7+
#[test]
8+
fn run_binary_with_same_name_as_file() -> Result<(), Error> {
9+
use std::fs;
10+
11+
let env = env_logger::Builder::new()
12+
.filter_module("rustwide", log::LevelFilter::Info)
13+
.default_format_timestamp(false)
14+
.is_test(true)
15+
.build();
16+
rustwide::logging::init_with(env);
17+
let tmpdir = tempfile::tempdir()?;
18+
std::env::set_current_dir(&tmpdir)?;
19+
fs::write("true", b"foobar")?;
20+
let workspace = WorkspaceBuilder::new(tempfile::tempdir()?.path(), USER_AGENT).fast_init(true).init()?;
21+
Command::new(&workspace, "true").run()?;
22+
23+
Ok(())
24+
}

0 commit comments

Comments
 (0)