Add workaround for issue reported in #1527.

batect · May 19, 2023 · 18d7a7e · 18d7a7e
1 parent 5b12d27
commit 18d7a7e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/app/src/main/kotlin/batect/docker/ImageBuildProgressAggregator.kt b/app/src/main/kotlin/batect/docker/ImageBuildProgressAggregator.kt
@@ -57,17 +57,17 @@ class ImageBuildProgressAggregator {
  return calculateCurrentProgress()
  }
 
- private fun processStepDownloadProgressUpdate(progressUpdate: StepDownloadProgressUpdate): AggregatedImageBuildProgress {
- val previousValue = activeSteps.getValue(progressUpdate.stepNumber)
+ private fun processStepDownloadProgressUpdate(progressUpdate: StepDownloadProgressUpdate): AggregatedImageBuildProgress? {
+ val previousValue = activeSteps[progressUpdate.stepNumber] ?: return null
  val totalBytes = if (progressUpdate.totalBytes <= 0) null else progressUpdate.totalBytes
  val updatedValue = previousValue.copy(detail = StepDetail.Downloading(progressUpdate.bytesDownloaded, totalBytes))
  activeSteps[progressUpdate.stepNumber] = updatedValue
 
  return calculateCurrentProgress()
  }
 
- private fun processStepPullProgressUpdate(progressUpdate: StepPullProgressUpdate): AggregatedImageBuildProgress {
- val previousValue = activeSteps.getValue(progressUpdate.stepNumber)
+ private fun processStepPullProgressUpdate(progressUpdate: StepPullProgressUpdate): AggregatedImageBuildProgress? {
+ val previousValue = activeSteps[progressUpdate.stepNumber] ?: return null
  val aggregator = if (previousValue.detail is StepDetail.PullingImage) previousValue.detail.aggregator else ImagePullProgressAggregator()
  val updatedAggregation = aggregator.processProgressUpdate(progressUpdate.pullProgress)
 

diff --git a/app/src/unitTest/kotlin/batect/docker/ImageBuildProgressAggregatorSpec.kt b/app/src/unitTest/kotlin/batect/docker/ImageBuildProgressAggregatorSpec.kt
@@ -289,5 +289,30 @@ object ImageBuildProgressAggregatorSpec : Spek({
  )
  }
  }
+
+ // This case covers the issue reported in https://github.com/batect/batect/issues/1527
+ on("a step reporting image pull progress before reporting that it has started") {
+ val aggregator by createForEachTest { ImageBuildProgressAggregator() }
+
+ val nextUpdate by runNullableForEachTest {
+ aggregator.processProgressUpdate(StepPullProgressUpdate(1, ImagePullProgressUpdate("Downloading", ImagePullProgressDetail(123, 456), "abc123")))
+ }
+
+ it("does not emit a new update") {
+ assertThat(nextUpdate, absent())
+ }
+ }
+
+ on("a step reporting download progress before reporting that it has started") {
+ val aggregator by createForEachTest { ImageBuildProgressAggregator() }
+
+ val nextUpdate by runNullableForEachTest {
+ aggregator.processProgressUpdate(StepDownloadProgressUpdate(1, 5, 100))
+ }
+
+ it("does not emit a new update") {
+ assertThat(nextUpdate, absent())
+ }
+ }
  }
 })