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

Two random very small fixes #653

Merged
merged 2 commits into from
Dec 19, 2018
Merged

Two random very small fixes #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec303ad
Slightly change test
NicolasMahe Dec 19, 2018
08ad681
add sid to doc json example
NicolasMahe Dec 19, 2018
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
2 changes: 1 addition & 1 deletion container/wait_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ func TestIntegrationWaitForStatusTaskError(t *testing.T) {
defer c.StopService(namespace)
err = c.waitForStatus(namespace, RUNNING)
require.Error(t, err)
require.Equal(t, "No such image: awgdaywudaywudwa:latest", err.Error())
require.Contains(t, "No such image: awgdaywudaywudwa:latest", err.Error())
Copy link
Member Author

Choose a reason for hiding this comment

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

Because sometimes err.Error() contains 2 times the same error. It's because of Docker's tasks. Sometime, Docker is fast and has time to run 2 tasks, sometime it's slow and run only 1 time.

}
2 changes: 2 additions & 0 deletions protobuf/coreapi/api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ message ListServicesRequest {
// {
// "services": [{
// "id": "idX",
// "sid": "sidX",
// "name": "serviceX",
// "description": "descriptionX",
// "status": "statusX",
Expand Down Expand Up @@ -381,6 +382,7 @@ message GetServiceRequest {
// {
// "service": {
// "id": "idX",
// "sid": "sidX",
// "name": "serviceX",
// "description": "descriptionX",
// "status": "statusX",
Expand Down