From b484cd38d750a95f0457590ca9630a0c03552945 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <japaricious@gmail.com>
Date: Fri, 22 Apr 2016 22:33:58 -0500
Subject: [PATCH] add tests for #2606

---
 tests/test_cargo_concurrent.rs | 36 +++++++++++++++++++++++++++++++++-
 tests/test_cargo_install.rs    | 15 ++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/tests/test_cargo_concurrent.rs b/tests/test_cargo_concurrent.rs
index 99dc624c0fa..ef91c63bbd8 100644
--- a/tests/test_cargo_concurrent.rs
+++ b/tests/test_cargo_concurrent.rs
@@ -1,4 +1,4 @@
-use std::env;
+use std::{env, str};
 use std::fs::{self, File};
 use std::io::Write;
 use std::net::TcpListener;
@@ -15,6 +15,12 @@ use test_cargo_install::{cargo_home, has_installed_exe};
 
 fn setup() {}
 
+fn pkg(name: &str, vers: &str) {
+    Package::new(name, vers)
+        .file("src/main.rs", "fn main() {{}}")
+        .publish();
+}
+
 test!(multiple_installs {
     let p = project("foo")
         .file("a/Cargo.toml", r#"
@@ -52,6 +58,34 @@ test!(multiple_installs {
     assert_that(cargo_home(), has_installed_exe("bar"));
 });
 
+test!(concurrent_installs {
+    const LOCKED_BUILD: &'static str = "waiting for file lock on build directory";
+
+    pkg("foo", "0.0.1");
+    pkg("bar", "0.0.1");
+
+    let mut a = ::cargo_process().arg("install").arg("foo").build_command();
+    let mut b = ::cargo_process().arg("install").arg("bar").build_command();
+
+    a.stdout(Stdio::piped()).stderr(Stdio::piped());
+    b.stdout(Stdio::piped()).stderr(Stdio::piped());
+
+    let a = a.spawn().unwrap();
+    let b = b.spawn().unwrap();
+    let a = thread::spawn(move || a.wait_with_output().unwrap());
+    let b = b.wait_with_output().unwrap();
+    let a = a.join().unwrap();
+
+    assert!(!str::from_utf8(&a.stderr).unwrap().contains(LOCKED_BUILD));
+    assert!(!str::from_utf8(&b.stderr).unwrap().contains(LOCKED_BUILD));
+
+    assert_that(a, execs().with_status(0));
+    assert_that(b, execs().with_status(0));
+
+    assert_that(cargo_home(), has_installed_exe("foo"));
+    assert_that(cargo_home(), has_installed_exe("bar"));
+});
+
 test!(one_install_should_be_bad {
     let p = project("foo")
         .file("a/Cargo.toml", r#"
diff --git a/tests/test_cargo_install.rs b/tests/test_cargo_install.rs
index 31d9bf7fcd8..cfad68443c8 100644
--- a/tests/test_cargo_install.rs
+++ b/tests/test_cargo_install.rs
@@ -659,3 +659,18 @@ test!(q_silences_warnings {
     assert_that(cargo_process("install").arg("-q").arg("--path").arg(p.root()),
                 execs().with_status(0).with_stderr(""));
 });
+
+test!(readonly_dir {
+    pkg("foo", "0.0.1");
+
+    let root = paths::root();
+    let dir = &root.join("readonly");
+    fs::create_dir(root.join("readonly")).unwrap();
+    let mut perms = fs::metadata(dir).unwrap().permissions();
+    perms.set_readonly(true);
+    fs::set_permissions(dir, perms).unwrap();
+
+    assert_that(cargo_process("install").arg("foo").cwd(dir),
+                execs().with_status(0));
+    assert_that(cargo_home(), has_installed_exe("foo"));
+});