Skip to content

chore: fix failing test for local run #5197

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

Merged
mergify merged 11 commits into from
Aug 16, 2023
+6 −4
Merged

chore: fix failing test for local run #5197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
29b76b5
readme updated
Varun359 Jun 7, 2023
042c746
readme updated
Varun359 Jun 7, 2023
ed95e3f
original readme
Varun359 Jun 8, 2023
9fe506f
Merge branch 'aws:mainline' into mainline
Varun359 Jul 14, 2023
9e7a8f7
Merge branch 'aws:mainline' into mainline
Varun359 Jul 17, 2023
332db9a
Merge remote-tracking branch 'refs/remotes/origin/mainline' into main…
Varun359 Jul 21, 2023
b3acfb8
Merge remote-tracking branch 'refs/remotes/origin/mainline' into main…
Varun359 Jul 27, 2023
28f6fd2
Merge remote-tracking branch 'refs/remotes/origin/mainline' into main…
Varun359 Aug 15, 2023
b4180cd
Merge remote-tracking branch 'refs/remotes/origin/mainline' into main…
Varun359 Aug 16, 2023
50b48d5
fix failing tests
Varun359 Aug 16, 2023
578c090
Merge branch 'aws:mainline' into fix-tests
Varun359 Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion internal/pkg/cli/local_run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,9 @@ func (o *localRunOpts) runPauseContainer(ctx context.Context, containerPorts map
errCh := make(chan error, 1)

go func() {
errCh <- o.dockerEngine.Run(ctx, runOptions)
if err := o.dockerEngine.Run(ctx, runOptions); err != nil {
errCh <- err
}
}()

// go routine to check if pause container is running
Expand Down
6 changes: 3 additions & 3 deletions internal/pkg/cli/local_run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package cli

import (
"context"
"errors"
"fmt"
"testing"
Expand Down Expand Up @@ -365,8 +364,9 @@ func TestLocalRunOpts_Execute(t *testing.T) {
return []string{"mockFeature1"}
},
}
m.mockDockerEngine.EXPECT().IsContainerRunning(mockPauseContainerName)
m.mockDockerEngine.EXPECT().Run(context.Background(), gomock.Any()).Return(testError)
m.mockDockerEngine.EXPECT().IsContainerRunning(mockPauseContainerName).AnyTimes()
m.mockDockerEngine.EXPECT().Run(gomock.Any(), gomock.Any()).Return(testError)

},
wantedError: fmt.Errorf("run pause container: %w", testError),
},
Expand Down