Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix intermittent issues with Wiremock connection reset simulation #2319

Merged
merged 1 commit into from
May 21, 2020
Merged

Fix intermittent issues with Wiremock connection reset simulation #2319

merged 1 commit into from
May 21, 2020

Conversation

bpiper
Copy link
Contributor

@bpiper bpiper commented May 18, 2020

References #2209

@probot-autolabeler probot-autolabeler bot added dependency-change For PRs changing the version of a dependency. p:aws-s3 labels May 18, 2020
@bpiper
Copy link
Contributor Author

bpiper commented May 18, 2020

As with previous PR, I'll run a bunch of Travis builds before considering this RTBM (though there seems to be some special property of master builds that causes the issue in question to manifest, unlike branch builds).

raboof
raboof reviewed May 19, 2020
View reviewed changes
s3/src/test/scala/akka/stream/alpakka/s3/scaladsl/S3WireMockBase.scala Outdated
| min-backoff = 0s
| max-backoff = 0s
| min-backoff = 100ms
| max-backoff = 300ms
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this intentionally part of this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, my bad... forgot to rebase after the last PR was merged. Fixed.

raboof
raboof approved these changes May 20, 2020
View reviewed changes
Copy link
Member

@raboof raboof left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like an improvement in any case, and the failure hasn't returned on this branch since.

Sorry about all the other failures in there, we have work to do still...

Do you think this is ready to squash-and-merge?

@bpiper
Copy link
Contributor Author

bpiper commented May 20, 2020

Probably, but I'll run a few more builds and then reset to remove the trigger commits.

@bpiper
Copy link
Contributor Author

bpiper commented May 21, 2020

RTBM now from my perspective.

@raboof
Copy link
Member

raboof commented May 21, 2020

Thanks! Let's see how this fares on master ;)

@raboof raboof merged commit 7204fd0 into akka:master May 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raboof raboof raboof approved these changes

Assignees
No one assigned
Labels
dependency-change For PRs changing the version of a dependency. p:aws-s3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bpiper @raboof