Fix runner waste collection: always provide a new instance instead of…

… providing old one

Sources/EmceeLib/Commands/DumpCommand.swift

@@ -96,7 +96,7 @@ public final class DumpCommand: Command {
  pluginEventBusProvider: try di.get(),
  processControllerProvider: try di.get(),
  resourceLocationResolver: try di.get(),
- runnerWasteCollector: try di.get(),
+ runnerWasteCollectorProvider: try di.get(),
  tempFolder: try di.get(),
  testRunnerProvider: try di.get(),
  uniqueIdentifierGenerator: try di.get(),

Sources/EmceeLib/Commands/RunTestsOnRemoteQueueCommand.swift

@@ -210,7 +210,7 @@ public final class RunTestsOnRemoteQueueCommand: Command {
  pluginEventBusProvider: try di.get(),
  processControllerProvider: try di.get(),
  resourceLocationResolver: try di.get(),
- runnerWasteCollector: try di.get(),
+ runnerWasteCollectorProvider: try di.get(),
  tempFolder: try di.get(),
  testRunnerProvider: try di.get(),
  uniqueIdentifierGenerator: try di.get(),

Sources/EmceeLib/InProcessMain.swift

@@ -145,8 +145,8 @@ public final class InProcessMain {
  )
 
  di.set(
- RunnerWasteCollectorImpl(),
- for: RunnerWasteCollector.self
+ RunnerWasteCollectorProviderImpl(),
+ for: RunnerWasteCollectorProvider.self
  )
 
  di.set(

Sources/Runner/Runner.swift

@@ -31,7 +31,7 @@ public final class Runner {
  private let pluginEventBusProvider: PluginEventBusProvider
  private let pluginTearDownQueue = OperationQueue()
  private let resourceLocationResolver: ResourceLocationResolver
- private let runnerWasteCollector: RunnerWasteCollector
+ private let runnerWasteCollectorProvider: RunnerWasteCollectorProvider
  private let specificMetricRecorder: SpecificMetricRecorder
  private let tempFolder: TemporaryFolder
  private let testRunnerProvider: TestRunnerProvider
@@ -55,7 +55,7 @@ public final class Runner {
  persistentMetricsJobId: String?,
  pluginEventBusProvider: PluginEventBusProvider,
  resourceLocationResolver: ResourceLocationResolver,
- runnerWasteCollector: RunnerWasteCollector,
+ runnerWasteCollectorProvider: RunnerWasteCollectorProvider,
  specificMetricRecorder: SpecificMetricRecorder,
  tempFolder: TemporaryFolder,
  testRunnerProvider: TestRunnerProvider,
@@ -72,7 +72,7 @@ public final class Runner {
  self.persistentMetricsJobId = persistentMetricsJobId
  self.pluginEventBusProvider = pluginEventBusProvider
  self.resourceLocationResolver = resourceLocationResolver
- self.runnerWasteCollector = runnerWasteCollector
+ self.runnerWasteCollectorProvider = runnerWasteCollectorProvider
  self.specificMetricRecorder = specificMetricRecorder
  self.tempFolder = tempFolder
  self.testRunnerProvider = testRunnerProvider
@@ -174,6 +174,7 @@ public final class Runner {
  testRunner: testRunner
  )
 
+ let runnerWasteCollector = runnerWasteCollectorProvider.createRunnerWasteCollector()
  runnerWasteCollector.scheduleCollection(path: testContext.testsWorkingDirectory)
  runnerWasteCollector.scheduleCollection(path: testContext.testRunnerWorkingDirectory)
  runnerWasteCollector.scheduleCollection(path: simulator.path.appending(relativePath: "data/Library/Caches/com.apple.containermanagerd/Dead"))
@@ -188,7 +189,7 @@ public final class Runner {
  pluginLocations: configuration.pluginLocations
  )
  defer {
- pluginTearDownQueue.addOperation { [fileSystem, runnerWasteCollector] in
+ pluginTearDownQueue.addOperation { [fileSystem] in
  eventBus.tearDown()
  RunnerWasteCleanerImpl(fileSystem: fileSystem).cleanWaste(runnerWasteCollector: runnerWasteCollector)
  }

Sources/Runner/RunnerWasteCollectorProvider.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+public protocol RunnerWasteCollectorProvider {
+ func createRunnerWasteCollector() -> RunnerWasteCollector
+}
+
+public final class RunnerWasteCollectorProviderImpl: RunnerWasteCollectorProvider {
+ public init() {}
+
+ public func createRunnerWasteCollector() -> RunnerWasteCollector { RunnerWasteCollectorImpl() }
+}

Sources/Scheduler/Scheduler.swift

@@ -222,7 +222,7 @@ public final class Scheduler {
  persistentMetricsJobId: bucket.analyticsConfiguration.persistentMetricsJobId,
  pluginEventBusProvider: try di.get(),
  resourceLocationResolver: try di.get(),
- runnerWasteCollector: try di.get(),
+ runnerWasteCollectorProvider: try di.get(),
  specificMetricRecorder: specificMetricRecorder,
  tempFolder: try di.get(),
  testRunnerProvider: try di.get(),

Sources/TestDiscovery/SpecificTestDiscoverers/RuntimeDumpTestDiscoverer.swift

@@ -26,7 +26,7 @@ final class RuntimeDumpTestDiscoverer: SpecificTestDiscoverer {
  private let onDemandSimulatorPool: OnDemandSimulatorPool
  private let pluginEventBusProvider: PluginEventBusProvider
  private let resourceLocationResolver: ResourceLocationResolver
- private let runnerWasteCollector: RunnerWasteCollector
+ private let runnerWasteCollectorProvider: RunnerWasteCollectorProvider
  private let simulatorControlTool: SimulatorControlTool
  private let tempFolder: TemporaryFolder
  private let testEntryToQueryRuntimeDump: TestEntry
@@ -46,7 +46,7 @@ final class RuntimeDumpTestDiscoverer: SpecificTestDiscoverer {
  onDemandSimulatorPool: OnDemandSimulatorPool,
  pluginEventBusProvider: PluginEventBusProvider,
  resourceLocationResolver: ResourceLocationResolver,
- runnerWasteCollector: RunnerWasteCollector,
+ runnerWasteCollectorProvider: RunnerWasteCollectorProvider,
  simulatorControlTool: SimulatorControlTool,
  tempFolder: TemporaryFolder,
  testEntryToQueryRuntimeDump: TestEntry = TestEntry(testName: TestName(className: "NonExistingTest", methodName: "fakeTest"), tags: [], caseId: nil),
@@ -65,7 +65,7 @@ final class RuntimeDumpTestDiscoverer: SpecificTestDiscoverer {
  self.onDemandSimulatorPool = onDemandSimulatorPool
  self.pluginEventBusProvider = pluginEventBusProvider
  self.resourceLocationResolver = resourceLocationResolver
- self.runnerWasteCollector = runnerWasteCollector
+ self.runnerWasteCollectorProvider = runnerWasteCollectorProvider
  self.simulatorControlTool = simulatorControlTool
  self.tempFolder = tempFolder
  self.testEntryToQueryRuntimeDump = testEntryToQueryRuntimeDump
@@ -99,7 +99,7 @@ final class RuntimeDumpTestDiscoverer: SpecificTestDiscoverer {
  persistentMetricsJobId: configuration.analyticsConfiguration.persistentMetricsJobId,
  pluginEventBusProvider: pluginEventBusProvider,
  resourceLocationResolver: resourceLocationResolver,
- runnerWasteCollector: runnerWasteCollector,
+ runnerWasteCollectorProvider: runnerWasteCollectorProvider,
  specificMetricRecorder: specificMetricRecorder,
  tempFolder: tempFolder,
  testRunnerProvider: testRunnerProvider,

Sources/TestDiscovery/TestDiscoveryQuerierImpl.swift

@@ -31,7 +31,7 @@ public final class TestDiscoveryQuerierImpl: TestDiscoveryQuerier {
  private let pluginEventBusProvider: PluginEventBusProvider
  private let processControllerProvider: ProcessControllerProvider
  private let resourceLocationResolver: ResourceLocationResolver
- private let runnerWasteCollector: RunnerWasteCollector
+ private let runnerWasteCollectorProvider: RunnerWasteCollectorProvider
  private let tempFolder: TemporaryFolder
  private let testRunnerProvider: TestRunnerProvider
  private let uniqueIdentifierGenerator: UniqueIdentifierGenerator
@@ -48,7 +48,7 @@ public final class TestDiscoveryQuerierImpl: TestDiscoveryQuerier {
  pluginEventBusProvider: PluginEventBusProvider,
  processControllerProvider: ProcessControllerProvider,
  resourceLocationResolver: ResourceLocationResolver,
- runnerWasteCollector: RunnerWasteCollector,
+ runnerWasteCollectorProvider: RunnerWasteCollectorProvider,
  tempFolder: TemporaryFolder,
  testRunnerProvider: TestRunnerProvider,
  uniqueIdentifierGenerator: UniqueIdentifierGenerator,
@@ -64,7 +64,7 @@ public final class TestDiscoveryQuerierImpl: TestDiscoveryQuerier {
  self.pluginEventBusProvider = pluginEventBusProvider
  self.processControllerProvider = processControllerProvider
  self.resourceLocationResolver = resourceLocationResolver
- self.runnerWasteCollector = runnerWasteCollector
+ self.runnerWasteCollectorProvider = runnerWasteCollectorProvider
  self.tempFolder = tempFolder
  self.testRunnerProvider = testRunnerProvider
  self.uniqueIdentifierGenerator = uniqueIdentifierGenerator
@@ -299,7 +299,7 @@ public final class TestDiscoveryQuerierImpl: TestDiscoveryQuerier {
  onDemandSimulatorPool: onDemandSimulatorPool,
  pluginEventBusProvider: pluginEventBusProvider,
  resourceLocationResolver: resourceLocationResolver,
- runnerWasteCollector: runnerWasteCollector,
+ runnerWasteCollectorProvider: runnerWasteCollectorProvider,
  simulatorControlTool: simulatorControlTool,
  tempFolder: tempFolder,
  testRunnerProvider: testRunnerProvider,

Tests/RunnerTestHelpers/FakeRunnerWasteCollectorProvider.swift

@@ -0,0 +1,16 @@
+import Foundation
+import Runner
+
+public class FakeRunnerWasteCollectorProvider: RunnerWasteCollectorProvider {
+ public var resultProvider: () -> RunnerWasteCollector
+
+ public init(
+ resultProvider: @escaping () -> RunnerWasteCollector = { RunnerWasteCollectorImpl() }
+ ) {
+ self.resultProvider = resultProvider
+ }
+
+ public func createRunnerWasteCollector() -> RunnerWasteCollector {
+ resultProvider()
+ }
+}

Tests/RunnerTests/RunnerTests.swift

@@ -505,7 +505,9 @@ public final class RunnerTests: XCTestCase {
  persistentMetricsJobId: nil,
  pluginEventBusProvider: noOpPluginEventBusProvider,
  resourceLocationResolver: resolver,
- runnerWasteCollector: runnerWasteCollector,
+ runnerWasteCollectorProvider: FakeRunnerWasteCollectorProvider { [runnerWasteCollector] in
+ runnerWasteCollector
+ },
  specificMetricRecorder: SpecificMetricRecorderWrapper(NoOpMetricRecorder()),
  tempFolder: tempFolder,
  testRunnerProvider: testRunnerProvider,

Tests/TestDiscoveryTests/TestDiscoveryQuerierTests.swift

@@ -225,7 +225,7 @@ final class TestDiscoveryQuerierTests: XCTestCase {
  pluginEventBusProvider: NoOoPluginEventBusProvider(),
  processControllerProvider: FakeProcessControllerProvider(),
  resourceLocationResolver: resourceLocationResolver,
- runnerWasteCollector: RunnerWasteCollectorImpl(),
+ runnerWasteCollectorProvider: FakeRunnerWasteCollectorProvider(),
  tempFolder: tempFolder,
  testRunnerProvider: testRunnerProvider,
  uniqueIdentifierGenerator: fixedValueUniqueIdentifierGenerator,