Namespace 'cpython' in installed dir

Closes #118
nbigaouette · Jan 15, 2020 · 088d84e · 088d84e
1 parent 27c4417
commit 088d84e
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 14 deletions.
diff --git a/src/toolchain/tests.rs b/src/toolchain/tests.rs
@@ -982,11 +982,19 @@ fn find_compatible_toolchain_multiple() {
             version: Version::parse("3.7.5").unwrap(),
         },
         InstalledToolchain {
-            location: pycors_home.join("installed").join("3.7.4").join("bin"),
+            location: pycors_home
+                .join("installed")
+                .join("cpython")
+                .join("3.7.4")
+                .join("bin"),
             version: Version::parse("3.7.4").unwrap(),
         },
         InstalledToolchain {
-            location: pycors_home.join("installed").join("3.8.0").join("bin"),
+            location: pycors_home
+                .join("installed")
+                .join("cpython")
+                .join("3.8.0")
+                .join("bin"),
             version: Version::parse("3.8.0").unwrap(),
         },
         InstalledToolchain {
@@ -1063,11 +1071,19 @@ fn find_compatible_toolchain_same_system_custom() {
             version: Version::parse("3.7.5").unwrap(),
         },
         InstalledToolchain {
-            location: pycors_home.join("installed").join("3.7.5").join("bin"),
+            location: pycors_home
+                .join("installed")
+                .join("cpython")
+                .join("3.7.5")
+                .join("bin"),
             version: Version::parse("3.7.5").unwrap(),
         },
         InstalledToolchain {
-            location: pycors_home.join("installed").join("4.0.0").join("bin"),
+            location: pycors_home
+                .join("installed")
+                .join("cpython")
+                .join("4.0.0")
+                .join("bin"),
             version: Version::parse("4.0.0").unwrap(),
         },
         InstalledToolchain {

diff --git a/src/utils/directory.rs b/src/utils/directory.rs
@@ -107,7 +107,7 @@ where
     }
 
     pub fn installed(&self) -> PathBuf {
-        self.project_home().join("installed")
+        self.project_home().join("installed").join("cpython")
     }
 
     pub fn logs(&self) -> PathBuf {
@@ -385,7 +385,7 @@ pub mod tests {
             let mocked_home = Some(home);
             let mocked_pycors_home = Some(pycors_home.clone());
 
-            let expected = pycors_home.join("installed");
+            let expected = pycors_home.join("installed").join("cpython");
 
             let mut mock = MockPycorsHomeProviderTrait::new();
             mock.expect_project_home()
@@ -406,7 +406,7 @@ pub mod tests {
             let mocked_home = Some(home);
             let mocked_pycors_home = Some(pycors_home.clone());
 
-            let expected = pycors_home.join("installed");
+            let expected = pycors_home.join("installed").join("cpython");
 
             let mut mock = MockPycorsHomeProviderTrait::new();
             mock.expect_project_home()
@@ -640,7 +640,10 @@ pub mod tests {
             let version_str = "3.7.5";
             let version = Version::parse(version_str).unwrap();
 
-            let expected = pycors_home.join("installed").join(version_str);
+            let expected = pycors_home
+                .join("installed")
+                .join("cpython")
+                .join(version_str);
 
             let mut mock = MockPycorsHomeProviderTrait::new();
             mock.expect_project_home()
@@ -664,7 +667,10 @@ pub mod tests {
             let version_str = "3.7.5";
             let version = Version::parse(version_str).unwrap();
 
-            let expected = pycors_home.join("installed").join(version_str);
+            let expected = pycors_home
+                .join("installed")
+                .join("cpython")
+                .join(version_str);
 
             let mut mock = MockPycorsHomeProviderTrait::new();
             mock.expect_project_home()
@@ -689,9 +695,16 @@ pub mod tests {
             let mocked_pycors_home = Some(pycors_home.clone());
 
             #[cfg(not(windows))]
-            let expected = pycors_home.join("installed").join(version_str).join("bin");
+            let expected = pycors_home
+                .join("installed")
+                .join("cpython")
+                .join(version_str)
+                .join("bin");
             #[cfg(windows)]
-            let expected = pycors_home.join("installed").join(version_str);
+            let expected = pycors_home
+                .join("installed")
+                .join("cpython")
+                .join(version_str);
 
             let mut mock = MockPycorsHomeProviderTrait::new();
             mock.expect_project_home()
@@ -716,9 +729,16 @@ pub mod tests {
             let version = Version::parse(version_str).unwrap();
 
             #[cfg(not(windows))]
-            let expected = pycors_home.join("installed").join(version_str).join("bin");
+            let expected = pycors_home
+                .join("installed")
+                .join("cpython")
+                .join(version_str)
+                .join("bin");
             #[cfg(windows)]
-            let expected = pycors_home.join("installed").join(version_str);
+            let expected = pycors_home
+                .join("installed")
+                .join("cpython")
+                .join(version_str);
 
             let mut mock = MockPycorsHomeProviderTrait::new();
             mock.expect_project_home()

diff --git a/tests/integration/mod.rs b/tests/integration/mod.rs
@@ -50,7 +50,7 @@ fn select(version: &str, cwd: &Path) {
 }
 
 fn installed(pycors_home: &Path, version: &str, installed_by_us: bool) -> Result<String> {
-    let installed_dir = pycors_home.join("installed");
+    let installed_dir = pycors_home.join("installed").join("cpython");
     let installation_dir = installed_dir.join(version);
 
     #[cfg(windows)]