fix: flaky test issue due to AbortedException. (#2925)

Arpan Mishra · web-flow · commit f9b8e037cde4 · 2024-02-23T19:31:33.000+05:30
* fix: prevent illegal negative timeout values into thread sleep() method while retrying exceptions in unit tests. * For details on issue see - googleapis/java-spanner#2206 * Fixing lint issues. * fix: flaky test issue due to AbortedException. * chore: remove assertion.
diff --git a/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java b/java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITTransactionTest.java
@@ -298,7 +298,6 @@ public void readAbort() throws Exception {
                           } catch (SpannerException e) {
                             if (e.getErrorCode() == ErrorCode.ABORTED) {
                               assertThat(e).isInstanceOf(AbortedException.class);
-                              assertThat(e.getRetryDelayInMillis()).isNotEqualTo(-1L);
                             }
                             throw new RuntimeException("Swallowed exception: " + e.getMessage());
                           }
@@ -338,7 +337,6 @@ public void readAbort() throws Exception {
                           } catch (SpannerException e) {
                             if (e.getErrorCode() == ErrorCode.ABORTED) {
                               assertThat(e).isInstanceOf(AbortedException.class);
-                              assertThat(e.getRetryDelayInMillis()).isNotEqualTo(-1L);
                             }
                             throw new RuntimeException("Swallowed exception: " + e.getMessage());
                           }

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,6 @@ public void readAbort() throws Exception {`
`298`	`298`	`} catch (SpannerException e) {`
`299`	`299`	`if (e.getErrorCode() == ErrorCode.ABORTED) {`
`300`	`300`	`assertThat(e).isInstanceOf(AbortedException.class);`
`301`		`- assertThat(e.getRetryDelayInMillis()).isNotEqualTo(-1L);`
`302`	`301`	`}`
`303`	`302`	`throw new RuntimeException("Swallowed exception: " + e.getMessage());`
`304`	`303`	`}`
`@@ -338,7 +337,6 @@ public void readAbort() throws Exception {`
`338`	`337`	`} catch (SpannerException e) {`
`339`	`338`	`if (e.getErrorCode() == ErrorCode.ABORTED) {`
`340`	`339`	`assertThat(e).isInstanceOf(AbortedException.class);`
`341`		`- assertThat(e.getRetryDelayInMillis()).isNotEqualTo(-1L);`
`342`	`340`	`}`
`343`	`341`	`throw new RuntimeException("Swallowed exception: " + e.getMessage());`
`344`	`342`	`}`