Make all test crates have unique names to prevent test deadlocks

carols10cents · carols10cents · commit bffd16a6cc07 · 2016-12-29T14:02:32.000-05:00
diff --git a/src/tests/all.rs b/src/tests/all.rs
@@ -290,8 +290,8 @@ fn new_req_with_categories(app: Arc<App>, krate: Crate, version: &str,
     return req;
 }
 
-fn new_req_body_foo_version_2() -> Vec<u8> {
-    new_req_body(::krate("foo"), "2.0.0", Vec::new(), Vec::new(), Vec::new())
+fn new_req_body_version_2(krate: Crate) -> Vec<u8> {
+    new_req_body(krate, "2.0.0", Vec::new(), Vec::new(), Vec::new())
 }
 
 fn new_req_body(krate: Crate, version: &str, deps: Vec<u::CrateDependency>,
diff --git a/src/tests/http-data/krate_good_categories b/src/tests/http-data/krate_good_categories
@@ -1,5 +1,5 @@
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-1.0.0.crate HTTP/1.1
+===REQUEST 349
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_good_cat/foo_good_cat-1.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Authorization: AWS AKIAJF3GEK7N44BACDZA:GDxGb6r3SIqo9wXuzHrgMNWekwk=
diff --git a/src/tests/http-data/krate_ignored_categories b/src/tests/http-data/krate_ignored_categories
@@ -1,5 +1,5 @@
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-1.0.0.crate HTTP/1.1
+===REQUEST 355
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_ignored_cat/foo_ignored_cat-1.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Authorization: AWS AKIAJF3GEK7N44BACDZA:GDxGb6r3SIqo9wXuzHrgMNWekwk=
diff --git a/src/tests/http-data/krate_new_crate_owner b/src/tests/http-data/krate_new_crate_owner
@@ -1,5 +1,5 @@
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-1.0.0.crate HTTP/1.1
+===REQUEST 344
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_owner/foo_owner-1.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Host: alexcrichton-test.s3.amazonaws.com
@@ -19,8 +19,8 @@ etag: "d41d8cd98f00b204e9800998ecf8427e"
 date: Sun, 28 Jun 2015 21:07:51 GMT
 
 
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-2.0.0.crate HTTP/1.1
+===REQUEST 344
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_owner/foo_owner-2.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Authorization: AWS AKIAJF3GEK7N44BACDZA:wz9J18+QxEhMIqIDnzwP6fGGeGY=
diff --git a/src/tests/http-data/krate_new_krate b/src/tests/http-data/krate_new_krate
@@ -1,5 +1,5 @@
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-1.0.0.crate HTTP/1.1
+===REQUEST 339
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_new/foo_new-1.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Authorization: AWS AKIAJF3GEK7N44BACDZA:GDxGb6r3SIqo9wXuzHrgMNWekwk=
diff --git a/src/tests/http-data/krate_new_krate_git_upload b/src/tests/http-data/krate_new_krate_git_upload
@@ -1,5 +1,5 @@
 ===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-1.0.0.crate HTTP/1.1
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/fgt/fgt-1.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Host: alexcrichton-test.s3.amazonaws.com
diff --git a/src/tests/http-data/krate_new_krate_git_upload_appends b/src/tests/http-data/krate_new_krate_git_upload_appends
@@ -1,5 +1,5 @@
 ===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/FOO/FOO-1.0.0.crate HTTP/1.1
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/FPP/FPP-1.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Authorization: AWS AKIAJF3GEK7N44BACDZA:mLugvy/BSBS8JgZ6pK7tURu3OTU=
diff --git a/src/tests/http-data/krate_new_krate_git_upload_with_conflicts b/src/tests/http-data/krate_new_krate_git_upload_with_conflicts
@@ -1,5 +1,5 @@
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-1.0.0.crate HTTP/1.1
+===REQUEST 351
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_conflicts/foo_conflicts-1.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Authorization: AWS AKIAJF3GEK7N44BACDZA:GDxGb6r3SIqo9wXuzHrgMNWekwk=
diff --git a/src/tests/http-data/krate_new_krate_too_big_but_whitelisted b/src/tests/http-data/krate_new_krate_too_big_but_whitelisted
@@ -1,5 +1,5 @@
-===REQUEST 2334
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-1.1.0.crate HTTP/1.1
+===REQUEST 2354
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_whitelist/foo_whitelist-1.1.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Type: application/x-tar
diff --git a/src/tests/http-data/krate_new_krate_twice b/src/tests/http-data/krate_new_krate_twice
@@ -1,5 +1,5 @@
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-2.0.0.crate HTTP/1.1
+===REQUEST 343
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_twice/foo_twice-2.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
diff --git a/src/tests/http-data/krate_new_krate_weird_version b/src/tests/http-data/krate_new_krate_weird_version
@@ -1,5 +1,5 @@
-===REQUEST 335
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-0.0.0-pre.crate HTTP/1.1
+===REQUEST 347
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_weird/foo_weird-0.0.0-pre.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Host: alexcrichton-test.s3.amazonaws.com
diff --git a/src/tests/http-data/krate_new_krate_with_dependency b/src/tests/http-data/krate_new_krate_with_dependency
@@ -1,5 +1,5 @@
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/new/new-1.0.0.crate HTTP/1.1
+===REQUEST 339
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/new_dep/new_dep-1.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Date: Sun, 28 Jun 2015 14:07:18 -0700
diff --git a/src/tests/http-data/krate_yank b/src/tests/http-data/krate_yank
@@ -1,5 +1,5 @@
 ===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-1.0.0.crate HTTP/1.1
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/fyk/fyk-1.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Date: Sun, 28 Jun 2015 14:07:18 -0700
diff --git a/src/tests/http-data/team_publish_owned b/src/tests/http-data/team_publish_owned
@@ -155,8 +155,8 @@ cache-control: private, max-age=60, s-maxage=60
 x-content-type-options: nosniff
 
 {"state":"active","url":"https://api.github.com/teams/1699377/memberships/crates-tester-1"}
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-2.0.0.crate HTTP/1.1
+===REQUEST 353
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_team_owned/foo_team_owned-2.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Host: alexcrichton-test.s3.amazonaws.com
diff --git a/src/tests/http-data/team_remove_team_as_team_owner b/src/tests/http-data/team_remove_team_as_team_owner
@@ -194,8 +194,8 @@ x-frame-options: deny
 x-ratelimit-reset: 1439881924
 
 {"state":"active","url":"https://api.github.com/teams/1699377/memberships/crates-tester-1"}
-===REQUEST 331
-PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo/foo-2.0.0.crate HTTP/1.1
+===REQUEST 367
+PUT http://alexcrichton-test.s3.amazonaws.com/crates/foo_remove_team_owner/foo_remove_team_owner-2.0.0.crate HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Date: Mon, 17 Aug 2015 23:12:52 -0700
diff --git a/src/tests/keyword.rs b/src/tests/keyword.rs
@@ -65,7 +65,7 @@ fn update_crate() {
         ::json::<GoodKeyword>(&mut response).keyword.crates_cnt as usize
     };
     ::mock_user(&mut req, ::user("foo"));
-    let (krate, _) = ::mock_crate(&mut req, ::krate("foo"));
+    let (krate, _) = ::mock_crate(&mut req, ::krate("fookey"));
     ::mock_keyword(&mut req, "kw1");
     ::mock_keyword(&mut req, "kw2");
 
diff --git a/src/tests/krate.rs b/src/tests/krate.rs
diff --git a/src/tests/team.rs b/src/tests/team.rs
diff --git a/src/tests/user.rs b/src/tests/user.rs
diff --git a/src/tests/version.rs b/src/tests/version.rs

Original file line number	Diff line number	Diff line change
`@@ -290,8 +290,8 @@ fn new_req_with_categories(app: Arc<App>, krate: Crate, version: &str,`
`290`	`290`	`return req;`
`291`	`291`	`}`
`292`	`292`
`293`		`-fn new_req_body_foo_version_2() -> Vec<u8> {`
`294`		`- new_req_body(::krate("foo"), "2.0.0", Vec::new(), Vec::new(), Vec::new())`
	`293`	`+fn new_req_body_version_2(krate: Crate) -> Vec<u8> {`
	`294`	`+ new_req_body(krate, "2.0.0", Vec::new(), Vec::new(), Vec::new())`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`fn new_req_body(krate: Crate, version: &str, deps: Vec<u::CrateDependency>,`