Refactoring

crates/cargo-test-support/src/registry.rs

@@ -44,12 +44,6 @@ pub fn alt_registry_path() -> PathBuf {
 pub fn alt_registry_url() -> Url {
     Url::from_file_path(alt_registry_path()).ok().unwrap()
 }
-pub fn alt2_registry_path() -> PathBuf {
-    paths::root().join("alternative2-registry")
-}
-pub fn alt2_registry_url() -> Url {
-    Url::from_file_path(alt_registry_path()).ok().unwrap()
-}
 /// Gets the alternative-registry version of `dl_path`.
 pub fn alt_dl_path() -> PathBuf {
     paths::root().join("alt_dl")
@@ -58,13 +52,6 @@ pub fn alt_dl_url() -> String {
     let base = Url::from_file_path(alt_dl_path()).ok().unwrap();
     format!("{}/{{crate}}/{{version}}/{{crate}}-{{version}}.crate", base)
 }
-pub fn alt2_dl_path() -> PathBuf {
-    paths::root().join("alt2_dl")
-}
-pub fn alt2_dl_url() -> String {
-    let base = Url::from_file_path(alt2_dl_path()).ok().unwrap();
-    format!("{}/{{crate}}/{{version}}/{{crate}}-{{version}}.crate", base)
-}
 /// Gets the alternative-registry version of `api_path`.
 pub fn alt_api_path() -> PathBuf {
     paths::root().join("alt_api")
@@ -72,11 +59,16 @@ pub fn alt_api_path() -> PathBuf {
 pub fn alt_api_url() -> Url {
     Url::from_file_path(alt_api_path()).ok().unwrap()
 }
-pub fn alt2_api_path() -> PathBuf {
-    paths::root().join("alt2_api")
+
+fn generate_path(name: &str) -> PathBuf {
+    paths::root().join(name)
 }
-pub fn alt2_api_url() -> Url {
-    Url::from_file_path(alt2_api_path()).ok().unwrap()
+fn generate_url(name: &str) -> Url {
+    Url::from_file_path(generate_path(name)).ok().unwrap()
+}
+fn generate_dl_url(name: &str) -> String {
+    let base = Url::from_file_path(generate_path(name)).ok().unwrap();
+    format!("{}/{{crate}}/{{version}}/{{crate}}-{{version}}.crate", base)
 }
 
 /// A builder for creating a new package in a registry.
@@ -191,7 +183,7 @@ pub fn init() {
     "#,
             reg = registry_url(),
             alt = alt_registry_url(),
-            alt2 = alt2_registry_url()
+            alt2 = generate_url("alternative2-registry")
         )
         .as_bytes()
     ));
@@ -203,9 +195,6 @@ pub fn init() {
 
         [registries.alternative]
         token = "api-token"
-
-        [registries.alternative2]
-        token = "api-token"
     "#
     ));
 
@@ -238,21 +227,23 @@ pub fn init() {
         )
         .build();
     fs::create_dir_all(alt_api_path().join("api/v1/crates")).unwrap();
+}
 
+pub fn init_alt2_registry() {
     // Initialize an alternative2 registry.
-    repo(&alt2_registry_path())
+    repo(&generate_path("alternative2-registry"))
         .file(
             "config.json",
             &format!(
                 r#"
             {{"dl":"{}","api":"{}"}}
         "#,
-                alt2_dl_url(),
-                alt2_api_url()
+                generate_dl_url("alt2_dl"),
+                generate_url("alt2_api")
             ),
         )
         .build();
-    fs::create_dir_all(alt2_api_path().join("api/v1/crates")).unwrap();
+    fs::create_dir_all(generate_path("alt2_api").join("api/v1/crates")).unwrap();
 }
 
 impl Package {

tests/testsuite/login.rs

@@ -170,6 +170,7 @@ fn new_credentials_is_used_instead_old() {
 #[cargo_test]
 fn registry_credentials() {
     registry::init();
+    registry::init_alt2_registry();
     setup_new_credentials();
 
     let reg = "alternative";