rust
/
cargo
mirror of https://github.com/rust-lang/cargo
0
0
Fork 0
Code Issues Releases Wiki Activity

Introduce git_process too

This commit is contained in:
Dale Wijnand 2018-08-02 15:27:06 +01:00
parent 8940d30668
commit dda661ddf2
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/testsuite/new.rs
View File

@ -2,7 +2,7 @@ use std::fs::{self, File};
use std::io::prelude::*;
use std::env;
use support::{cargo_process, process};
use support::{cargo_process, git_process};
use support::{execs, paths};
use support::hamcrest::{assert_that, existing_dir, existing_file, is_not};
@ -273,14 +273,8 @@ fn finds_author_email() {
#[test]
fn finds_author_git() {
process("git")
.args(&["config", "--global", "user.name", "bar"])
.exec()
.unwrap();
process("git")
.args(&["config", "--global", "user.email", "baz"])
.exec()
.unwrap();
git_process("config --global user.name bar").exec().unwrap();
git_process("config --global user.email baz").exec().unwrap();
assert_that(
cargo_process("new foo").env("USER", "foo"),
execs().with_status(0),
@ -297,25 +291,13 @@ fn finds_author_git() {
#[test]
fn finds_local_author_git() {
process("git").args(&["init"]).exec().unwrap();
process("git")
.args(&["config", "--global", "user.name", "foo"])
.exec()
.unwrap();
process("git")
.args(&["config", "--global", "user.email", "foo@bar"])
.exec()
.unwrap();
git_process("init").exec().unwrap();
git_process("config --global user.name foo").exec().unwrap();
git_process("config --global user.email foo@bar").exec().unwrap();
// Set local git user config
process("git")
.args(&["config", "user.name", "bar"])
.exec()
.unwrap();
process("git")
.args(&["config", "user.email", "baz"])
.exec()
.unwrap();
git_process("config user.name bar").exec().unwrap();
git_process("config user.email baz").exec().unwrap();
assert_that(
cargo_process("init").env("USER", "foo"),
execs().with_status(0),
@ -369,14 +351,8 @@ fn finds_git_author() {
#[test]
fn author_prefers_cargo() {
process("git")
.args(&["config", "--global", "user.name", "foo"])
.exec()
.unwrap();
process("git")
.args(&["config", "--global", "user.email", "bar"])
.exec()
.unwrap();
git_process("config --global user.name foo").exec().unwrap();
git_process("config --global user.email bar").exec().unwrap();
let root = paths::root();
fs::create_dir(&root.join(".cargo")).unwrap();
File::create(&root.join(".cargo/config"))

6
tests/testsuite/support/mod.rs
View File

@ -1386,6 +1386,12 @@ pub fn cargo_process(s: &str) -> ProcessBuilder {
p
}
pub fn git_process(s: &str) -> ProcessBuilder {
let mut p = process("git");
split_and_add_args(&mut p, s);
p
}
pub fn sleep_ms(ms: u64) {
::std::thread::sleep(Duration::from_millis(ms));
}