test client doesn't package toolchain twice if the scheduler already has it

Author: trxcllnt

tests/dist.rs

@@ -300,13 +300,15 @@ async fn test_dist_cpp_toolchain(message_broker: &str) -> Result<()> {
         .await?;
 
     // Run twice to verify toolchain is only uploaded once
-    for _ in 0..2 {
+    for i in 0..2 {
         let client = system.new_client(&dist_test_sccache_client_cfg(
             system.data_dir(),
             system.scheduler(0)?.url(),
             false,
         ));
 
+        let tc_dir = client.clear_toolchains_cache()?;
+
         cc_compile(&client, system.test_dir()).await?;
 
         let stats = client.stats()?;
@@ -318,6 +320,13 @@ async fn test_dist_cpp_toolchain(message_broker: &str) -> Result<()> {
         assert_eq!(0, stats.cache_hits.all());
 
         assert_eq!(system.count_server_toolchains(system.server(0)?)?, 1);
+
+        // Ensure the client doesn't package the toolchain again the 2nd time
+        if i == 0 {
+            assert_eq!(std::fs::read_dir(tc_dir).map(|dir| dir.count())?, 1);
+        } else {
+            assert_eq!(std::fs::read_dir(tc_dir).map(|dir| dir.count())?, 0);
+        }
     }
 
     Ok(())

tests/harness/client.rs

@@ -173,7 +173,7 @@ impl SccacheClient {
         );
     }
 
-    pub fn clear_disk_cache(&self) -> sccache::errors::Result<()> {
+    pub fn clear_disk_cache(&self) -> sccache::errors::Result<PathBuf> {
         self.zero_stats();
         let disk_cache = (|| {
             if let Some(cfg_path_idx) = self.envvars.iter().position(|(k, _)| k == "SCCACHE_CONF") {
@@ -191,10 +191,10 @@ impl SccacheClient {
         })();
         println!("clear_disk_cache: {:?}", disk_cache.dir);
         fs::remove_dir_all(&disk_cache.dir)?;
-        Ok(())
+        Ok(disk_cache.dir.clone())
     }
 
-    pub fn clear_toolchains_cache(&self) -> sccache::errors::Result<()> {
+    pub fn clear_toolchains_cache(&self) -> sccache::errors::Result<PathBuf> {
         let dist_config = (|| {
             if let Some(cfg_path_idx) = self.envvars.iter().position(|(k, _)| k == "SCCACHE_CONF") {
                 if let Some((_, cfg_path)) = self.envvars.get(cfg_path_idx) {
@@ -207,9 +207,17 @@ impl SccacheClient {
             }
             DistConfig::default()
         })();
-        println!("clear_toolchains_cache: {:?}", dist_config.cache_dir);
-        fs::remove_dir_all(&dist_config.cache_dir)?;
-        Ok(())
+        let tc_dir = dist_config.cache_dir.join("client").join("tc");
+        println!("clear_toolchains_cache: {:?}", tc_dir);
+        for entry in std::fs::read_dir(&tc_dir)? {
+            let path = entry?.path();
+            if fs::symlink_metadata(&path)?.is_dir() {
+                fs::remove_dir_all(&path)?;
+            } else {
+                fs::remove_file(&path)?;
+            }
+        }
+        Ok(tc_dir.clone())
     }
 }