From 50f90122af3002437cda86b88c69145b37058a6d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 5 Oct 2016 23:44:51 +0200 Subject: [PATCH] Adopt tests to Vault 0.5 and 0.6.0. Earlier Vault versions run into issues with renewal of orphan tokens. See gh-13. --- .../LifecycleAwareSessionManagerIntegrationTests.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerIntegrationTests.java index 7d5c5243..545b8402 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/authentication/LifecycleAwareSessionManagerIntegrationTests.java @@ -50,7 +50,6 @@ public class LifecycleAwareSessionManagerIntegrationTests extends IntegrationTes prepare().getVaultClient()); assertThat(sessionManager.getSessionToken()).isSameAs(loginToken); - } // Expect no exception to be thrown. @@ -64,7 +63,7 @@ public class LifecycleAwareSessionManagerIntegrationTests extends IntegrationTes tokenRequest.setTtl("1h"); tokenRequest.setExplicitMaxTtl("10h"); - VaultToken token = tokenOperations.createOrphan(tokenRequest).getToken(); + VaultToken token = tokenOperations.create(tokenRequest).getToken(); TokenAuthentication tokenAuthentication = new TokenAuthentication(LoginToken.renewable(token.getToken(), 0)); @@ -105,7 +104,8 @@ public class LifecycleAwareSessionManagerIntegrationTests extends IntegrationTes VaultResponseEntity entity = session .getForEntity(String.format("auth/token/lookup/%s", loginToken.getToken()), Map.class); - assertThat(entity.getStatusCode()).isIn(HttpStatus.NOT_FOUND, HttpStatus.FORBIDDEN); + // Compatibility across Vault versions. + assertThat(entity.getStatusCode()).isIn(HttpStatus.BAD_REQUEST, HttpStatus.NOT_FOUND, HttpStatus.FORBIDDEN); return null; } });