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.

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

skipper: fix TestDataClients #2418

Merged
merged 1 commit into from
Jun 22, 2023

Conversation

AlexanderYastrebov
Copy link
Member

@AlexanderYastrebov AlexanderYastrebov commented Jun 21, 2023

  • fix swarm init error handling
  • remove TestDataClients invalid swarm options

Comment on lines +1630 to 1636
return fmt.Errorf("failed to init swarm with options %+v: %w", swops, err)
}
defer theSwarm.Leave()
Copy link
Member Author

@AlexanderYastrebov AlexanderYastrebov Jun 21, 2023

Choose a reason for hiding this comment

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

run does not fail because here it only logged the error and later defer theSwarm.Leave() caused panic

@@ -1026,21 +1026,23 @@ func TestDataClients(t *testing.T) {
sigs := make(chan os.Signal, 1)
go run(o, sigs, nil)

// wait for proxy being ready
for {
for i := 0; i < 10; i++ {
Copy link
Member Author

@AlexanderYastrebov AlexanderYastrebov Jun 21, 2023

Choose a reason for hiding this comment

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

After log is changed to return error proxy is never ready due to infinite wait

@szuecs
Copy link
Member

szuecs commented Jun 21, 2023

👍

* fix swarm init error handling
* remove TestDataClients invalid swarm options

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
@AlexanderYastrebov AlexanderYastrebov marked this pull request as ready for review June 22, 2023 08:53
@AlexanderYastrebov
Copy link
Member Author

AlexanderYastrebov commented Jun 22, 2023

Pipeline failed due to #2386

@szuecs
Copy link
Member

szuecs commented Jun 22, 2023

👍

1 similar comment
@MustafaSaber
Copy link
Member

👍

@AlexanderYastrebov AlexanderYastrebov merged commit 171625c into master Jun 22, 2023
@AlexanderYastrebov AlexanderYastrebov deleted the skipper/fix-test-data-clients branch June 22, 2023 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants