Fix tests

Author: DonJayamanne

crates/pet-conda/src/environments.rs

@@ -30,25 +30,25 @@ impl CondaEnvironment {
         get_conda_environment_info(path, manager)
     }
 
-    pub fn to_python_environment(
-        &self,
-        conda_dir: Option<PathBuf>,
-        conda_manager: Option<EnvManager>,
-    ) -> PythonEnvironment {
+    pub fn to_python_environment(&self, conda_manager: Option<EnvManager>) -> PythonEnvironment {
         #[allow(unused_assignments)]
         let mut name: Option<String> = None;
 
         // We can name the conda envs only if we have a conda manager.
         if let Some(conda_manager) = &conda_manager {
             // If the conda manager for this environment is in the same folder as the conda environment,
             // Then this is a root conda environment.
-            if conda_manager.executable.starts_with(&self.prefix) && is_conda_install(&self.prefix) && self.conda_dir.is_none(){
+            if conda_manager.executable.starts_with(&self.prefix)
+                && is_conda_install(&self.prefix)
+                && !self.conda_dir.is_none()
+            {
                 name = Some("base".to_string());
             } else {
                 name = self
                     .prefix
                     .file_name()
                     .map(|name| name.to_str().unwrap_or_default().to_string());
+            }
         }
 
         let builder = PythonEnvironmentBuilder::new(Some(PythonEnvironmentKind::Conda))

crates/pet-conda/src/lib.rs

@@ -174,8 +174,7 @@ impl CondaLocator for Conda {
                     if environments.contains_key(&conda_env.prefix) {
                         continue;
                     }
-                    let env = conda_env
-                        .to_python_environment(Some(conda_dir.clone()), Some(manager.to_manager()));
+                    let env = conda_env.to_python_environment(Some(manager.to_manager()));
                     environments.insert(conda_env.prefix.clone(), env.clone());
                     reporter.report_manager(&manager.to_manager());
                     reporter.report_environment(&env);
@@ -248,18 +247,15 @@ impl Locator for Conda {
             if let Some(env) = get_conda_environment_info(path, &None) {
                 if let Some(conda_dir) = &env.conda_dir {
                     if let Some(manager) = self.get_manager(conda_dir) {
-                        let env = env.to_python_environment(
-                            Some(conda_dir.clone()),
-                            Some(manager.to_manager()),
-                        );
+                        let env = env.to_python_environment(Some(manager.to_manager()));
                         environments.insert(path.clone(), env.clone());
                         return Some(env);
                     } else {
                         // We will still return the conda env even though we do not have the manager.
                         // This might seem incorrect, however the tool is about discovering environments.
                         // The client can activate this env either using another conda manager or using the activation scripts
                         error!("Unable to find Conda Manager for env (even though we have a conda_dir): {:?}", env);
-                        let env = env.to_python_environment(Some(conda_dir.clone()), None);
+                        let env = env.to_python_environment(None);
                         environments.insert(path.clone(), env.clone());
                         return Some(env);
                     }
@@ -268,7 +264,7 @@ impl Locator for Conda {
                     // This might seem incorrect, however the tool is about discovering environments.
                     // The client can activate this env either using another conda manager or using the activation scripts
                     error!("Unable to find Conda Manager for env: {:?}", env);
-                    let env = env.to_python_environment(None, None);
+                    let env = env.to_python_environment(None);
                     environments.insert(path.clone(), env.clone());
                     return Some(env);
                 }
@@ -301,7 +297,7 @@ impl Locator for Conda {
                         // The client can activate this env either using another conda manager or using the activation scripts
                         error!("Unable to find Conda Manager for the Conda env: {:?}", env);
                         let prefix = env.prefix.clone();
-                        let env = env.to_python_environment(None, None);
+                        let env = env.to_python_environment(None);
                         let mut environments = self.environments.lock().unwrap();
                         environments.insert(prefix, env.clone());
                         reporter.report_environment(&env);
@@ -340,7 +336,6 @@ impl Locator for Conda {
                     // 5. Report this env.
                     if let Some(manager) = manager {
                         let env = env.to_python_environment(
-                            manager.conda_dir.clone(),
                             Some(manager.to_manager()),
                         );
                         let mut environments = self.environments.lock().unwrap();
@@ -352,7 +347,7 @@ impl Locator for Conda {
                         // This might seem incorrect, however the tool is about discovering environments.
                         // The client can activate this env either using another conda manager or using the activation scripts
                         error!("Unable to find Conda Manager for Conda env (even though we have a conda_dir {:?}): Env Details = {:?}", conda_dir, env);
-                        let env = env.to_python_environment(Some(conda_dir.clone()), None);
+                        let env = env.to_python_environment(None);
                         let mut environments = self.environments.lock().unwrap();
                         environments.insert(prefix.clone(), env.clone());
                         reporter.report_environment(&env);

crates/pet-conda/tests/lib_test.rs

@@ -32,7 +32,7 @@ fn find_conda_env_without_manager() {
     assert_eq!(env.executable, path.join("bin").join("python").into());
     assert_eq!(env.version, "3.12.2".to_string().into());
     assert_eq!(env.manager, None);
-    assert_eq!(env.name, "env_python_3".to_string().into());
+    assert_eq!(env.name, None);
 }
 
 #[cfg(unix)]
@@ -90,5 +90,5 @@ fn find_conda_env_without_manager_but_detect_manager_from_history() {
         env.manager.clone().unwrap().version,
         "23.1.0".to_string().into()
     );
-    assert_eq!(env.name, None);
+    assert_eq!(env.name, "env_python_3".to_string().into());
 }