Merge pull request #23 from rock-core/remove_logs_during_cache_cleanup

fix: Remove logs during cache cleanup
rock-core · Jun 27, 2023 · 735d7dd · 735d7dd
2 parents 3ca2344 + a367289
commit 735d7dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lib/autoproj/cli/ci.rb b/lib/autoproj/cli/ci.rb
@@ -337,6 +337,7 @@ def cleanup_build_cache(dir, size_limit)
 
                     FileUtils.rm_f path
                     FileUtils.rm_f "#{path}.json"
+                    FileUtils.rm_f "#{path}.logs"
                     total_size -= stat.size
                 end
 

diff --git a/test/autoproj/cli/ci_test.rb b/test/autoproj/cli/ci_test.rb
@@ -665,6 +665,7 @@ def self.consolidated_report_single_behavior( # rubocop:disable Metrics/AbcSize
                 @paths.each do |p|
                     assert File.exist?(p)
                     assert File.exist?("#{p}.json")
+                    assert File.exist?("#{p}.logs")
                 end
                 assert_equal 4096, result
             end
@@ -677,10 +678,12 @@ def self.consolidated_report_single_behavior( # rubocop:disable Metrics/AbcSize
                 [@paths[1], @paths[3]].each do |p|
                     assert File.exist?(p)
                     assert File.exist?("#{p}.json")
+                    assert File.exist?("#{p}.logs")
                 end
                 [@paths[0], @paths[2]].each do |p|
                     refute File.exist?(p)
                     refute File.exist?("#{p}.json")
+                    refute File.exist?("#{p}.logs")
                 end
                 assert_equal 2048, result
             end
@@ -691,6 +694,7 @@ def create_file(path, size)
                     io.write " " * size
                 end
                 FileUtils.touch "#{path}.json"
+                FileUtils.touch "#{path}.logs"
                 path
             end
         end