Add test for publish with [patch] + cleanup.

[ehuss]

This adds a test for publishing with a [patch] dependency. There is also a bunch of refactoring/cleanup to make that work better. Previously there were no tests for publishing with a dependency! A rough summary of the changes:

• Remove all the duplicate code from support::publish, consolidate everything in support::registry.
• Move API tokens into .cargo/credentials so it's easier to remove them in tests.
• Rename registry/alt_registry to registry_url/alt_registry_url to be consistent with all the other function names and to avoid ambiguity.
• Separate the default 'dl' and 'api' directories. Not really important, but is more consistent with the alt registry layout.

[rust-highfive]

r? @dwijnand

(rust_highfive has picked a reviewer for you, use r? to override)

[ehuss]

@jethrogb The infrastructure for properly testing a [patch] upload wasn't really there, so this adds it. I'm not sure how familiar you are with Cargo's test infrastructure. There's a little bit of documentation at support/mod.rs and scattered throughout. Hopefully it's pretty self-explanatory, though.

Once this is ok'd, you can modify this test with something like the following to verify the new behavior in #6535.

diff --git a/tests/testsuite/publish.rs b/tests/testsuite/publish.rs
index b6abb7ee..3c95fd74 100644
--- a/tests/testsuite/publish.rs
+++ b/tests/testsuite/publish.rs
@@ -829,17 +829,72 @@ fn publish_with_patch() {
             bar = { path = "bar" }
         "#,
         )
-        .file("src/main.rs", "extern crate bar; fn main() {}")
+        .file(
+            "src/main.rs",
+            "extern crate bar;
+             fn main() {
+                 bar::newfunc();
+             }",
+        )
         .file("bar/Cargo.toml", &basic_manifest("bar", "1.0.0"))
-        .file("bar/src/lib.rs", "")
+        .file("bar/src/lib.rs", "pub fn newfunc() {}")
         .build();

     // Check that it works with the patched crate.
     p.cargo("build").run();

+    // Check that verify fails with patched crate which has new functionality.
     p.cargo("publish --index")
         .arg(registry_url().to_string())
+        .with_stderr_contains("[..]newfunc[..]")
         .with_status(101)
-        .with_stderr_contains("[ERROR] published crates cannot contain [patch] sections")
         .run();
+
+    // Remove the usage of new functionality and try again.
+    p.change_file("src/main.rs", "extern crate bar; pub fn main() {}");
+
+    p.cargo("publish --index")
+        .arg(registry_url().to_string())
+        .with_stderr_contains("[WARNING] cargo will remove your [patch] section before publishing")
+        .run();
+
+    // Note, use of `registry` in the deps here is an artifact that this
+    // publishes to a fake, local registry that is pretending to be crates.io.
+    // Normal publishes would set it to null.
+    publish::validate_upload(
+        r#"
+        {
+          "authors": [],
+          "badges": {},
+          "categories": [],
+          "deps": [
+            {
+              "default_features": true,
+              "features": [],
+              "kind": "normal",
+              "name": "bar",
+              "optional": false,
+              "registry": "https://github.com/rust-lang/crates.io-index",
+              "target": null,
+              "version_req": "^1.0"
+            }
+          ],
+          "description": "foo",
+          "documentation": null,
+          "features": {},
+          "homepage": null,
+          "keywords": [],
+          "license": "MIT",
+          "license_file": null,
+          "links": null,
+          "name": "foo",
+          "readme": null,
+          "readme_file": null,
+          "repository": null,
+          "vers": "0.0.1"
+          }
+        "#,
+        "foo-0.0.1.crate",
+        &["Cargo.toml", "Cargo.toml.orig", "src/main.rs"],
+    );
 }

[alexcrichton]

Thanks @ehuss! r=me with a rebase

[ehuss]

@bors r=alexcrichton

[bors]

📌 Commit b5144c7 has been approved by alexcrichton

[bors]

⌛ Testing commit b5144c7 with merge 2b4a5f1...

[bors]

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing 2b4a5f1 to master...

[dwijnand]

Nice one!