Auto merge of #2440 - ThinTim:master, r=alexcrichton

Prevent the use of "test" as a crate name

Fixes #2432

?r @alexcrichton

src/cargo/ops/cargo_new.rs

@@ -89,6 +89,12 @@ fn get_name<'a>(path: &'a Path, opts: &'a NewOptions, config: &Config) -> CargoR
 }
 
 fn check_name(name: &str) -> CargoResult<()> {
+    if name == "test" {
+        bail!("The name `{}` cannot be used as a crate name\n\
+               use --name to override crate name",
+               name)
+    }
+
     for c in name.chars() {
         if c.is_alphanumeric() { continue }
         if c == '_' || c == '-' { continue }

tests/test_cargo_init.rs

@@ -239,6 +239,20 @@ error = ERROR)));
     assert_that(&foo.join("Cargo.toml"), is_not(existing_file()));
 });
 
+test!(reserved_name {
+    let test = &paths::root().join("test");
+    fs::create_dir_all(&test).unwrap();
+    assert_that(cargo_process("init").cwd(test.clone())
+                                     .env("USER", "foo"),
+                execs().with_status(101).with_stderr(&format!("\
+{error} The name `test` cannot be used as a crate name\n\
+use --name to override crate name
+",
+error = ERROR)));
+
+    assert_that(&test.join("Cargo.toml"), is_not(existing_file()));
+});
+
 test!(git_autodetect {
     fs::create_dir(&paths::root().join(".git")).unwrap();
 

tests/test_cargo_new.rs

@@ -95,6 +95,15 @@ use --name to override crate name",
 error = ERROR)));
 });
 
+test!(reserved_name {
+    assert_that(cargo_process("new").arg("test"),
+                execs().with_status(101)
+                       .with_stderr(&format!("\
+{error} The name `test` cannot be used as a crate name\n\
+use --name to override crate name",
+error = ERROR)));
+});
+
 test!(rust_prefix_stripped {
     assert_that(cargo_process("new").arg("rust-foo").env("USER", "foo"),
                 execs().with_status(0)