Skip to content

Commit

Permalink
Merge branch 'master' into config-initializer-update
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jan 12, 2024
2 parents eff2d36 + dcae9d6 commit 9e3751e
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import static org.springframework.http.HttpStatus.BAD_GATEWAY;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
Expand Down Expand Up @@ -118,7 +118,7 @@ public void retriesRetryableHttpSeriesTillMaxAttemptsAndThrowsException() throws
any(CanaryConfig.class),
any(CanaryMetricConfig.class),
any(CanaryScope.class));
verifyZeroInteractions(storageService);
verifyNoMoreInteractions(storageService);
}

@Test
Expand Down Expand Up @@ -198,7 +198,7 @@ public void doesNotRetryNonRetryableHttpStatusAndThrowsException() throws IOExce
any(CanaryConfig.class),
any(CanaryMetricConfig.class),
any(CanaryScope.class));
verifyZeroInteractions(storageService);
verifyNoMoreInteractions(storageService);
}

@Test
Expand Down Expand Up @@ -226,7 +226,7 @@ public void retriesIoExceptionTillMaxAttemptsAndThrowsException() throws IOExcep
any(CanaryConfig.class),
any(CanaryMetricConfig.class),
any(CanaryScope.class));
verifyZeroInteractions(storageService);
verifyNoMoreInteractions(storageService);
}

@Test
Expand Down Expand Up @@ -256,7 +256,7 @@ public void retriesNetworkErrorTillMaxAttemptsAndThrowsException() throws IOExce
any(CanaryConfig.class),
any(CanaryMetricConfig.class),
any(CanaryScope.class));
verifyZeroInteractions(storageService);
verifyNoMoreInteractions(storageService);
}

private SpinnakerHttpException getSpinnakerHttpException(int status) {
Expand Down

0 comments on commit 9e3751e

Please sign in to comment.