From ec303ad9682cb05e8dd7d2a7af9f3239c7cc4aa3 Mon Sep 17 00:00:00 2001 From: Nicolas Mahe Date: Wed, 19 Dec 2018 14:27:52 +0700 Subject: [PATCH 1/2] Slightly change test --- container/wait_integration_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/wait_integration_test.go b/container/wait_integration_test.go index d8aa79038..4471d040b 100644 --- a/container/wait_integration_test.go +++ b/container/wait_integration_test.go @@ -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()) } From 08ad68130400f00fc2203e56dcce17131908172c Mon Sep 17 00:00:00 2001 From: Nicolas Mahe Date: Wed, 19 Dec 2018 14:28:04 +0700 Subject: [PATCH 2/2] add sid to doc json example --- protobuf/coreapi/api.proto | 2 ++ 1 file changed, 2 insertions(+) diff --git a/protobuf/coreapi/api.proto b/protobuf/coreapi/api.proto index dc2a40a55..89a2b0032 100644 --- a/protobuf/coreapi/api.proto +++ b/protobuf/coreapi/api.proto @@ -316,6 +316,7 @@ message ListServicesRequest { // { // "services": [{ // "id": "idX", +// "sid": "sidX", // "name": "serviceX", // "description": "descriptionX", // "status": "statusX", @@ -381,6 +382,7 @@ message GetServiceRequest { // { // "service": { // "id": "idX", +// "sid": "sidX", // "name": "serviceX", // "description": "descriptionX", // "status": "statusX",