From 7c5481c11ab778508772151780307535f255ab52 Mon Sep 17 00:00:00 2001 From: Masahiro Sano Date: Sat, 14 Mar 2015 01:08:07 +0900 Subject: [PATCH] return 200 instead 409 Conflict --- test/integration/auth_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/auth_test.go b/test/integration/auth_test.go index b352c1624ea..f99ea98edbd 100644 --- a/test/integration/auth_test.go +++ b/test/integration/auth_test.go @@ -252,7 +252,7 @@ func getTestRequests() []struct { // Normal methods on minions {"GET", "/api/v1beta1/minions", "", code200}, {"POST", "/api/v1beta1/minions" + timeoutFlag, aMinion, code201}, - {"PUT", "/api/v1beta1/minions/a" + timeoutFlag, aMinion, code409}, // See #2115 about why 409 + {"PUT", "/api/v1beta1/minions/a" + timeoutFlag, aMinion, code200}, {"GET", "/api/v1beta1/minions", "", code200}, {"GET", "/api/v1beta1/minions/a", "", code200}, {"DELETE", "/api/v1beta1/minions/a" + timeoutFlag, "", code200},