diff --git a/.travis.yml b/.travis.yml index ecf9eda2..44c5a261 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ env: - VAULT_VER=0.8.0 - VAULT_VER=0.8.1 - VAULT_VER=0.8.2 + - VAULT_VER=0.8.3 - PROFILE=springNext before_install: diff --git a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java index 0cb53841..dfb2258d 100644 --- a/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java +++ b/spring-vault-core/src/test/java/org/springframework/vault/core/VaultSysTemplateIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ package org.springframework.vault.core; +import java.util.Arrays; import java.util.Collections; import java.util.Map; @@ -58,8 +59,9 @@ public class VaultSysTemplateIntegrationTests extends IntegrationTestSupport { assertThat(mounts).containsKey("secret/"); VaultMount secret = mounts.get("secret/"); - assertThat(secret.getDescription()).isEqualTo("generic secret storage"); - assertThat(secret.getType()).isEqualTo("generic"); + assertThat(Arrays.asList("generic secret storage", "key/value secret storage")) + .contains(secret.getDescription()); + assertThat(Arrays.asList("kv", "generic")).contains(secret.getType()); } @Test @@ -82,7 +84,7 @@ public class VaultSysTemplateIntegrationTests extends IntegrationTestSupport { VaultMount secret = mounts.get("other/"); assertThat(secret.getDescription()).isEqualTo(mount.getDescription()); assertThat(secret.getConfig()).containsEntry("default_lease_ttl", 3600); - assertThat(secret.getType()).isEqualTo("generic"); + assertThat(Arrays.asList("kv", "generic")).contains(secret.getType()); } @Test diff --git a/src/test/bash/install_vault.sh b/src/test/bash/install_vault.sh index 338a1135..c46c7107 100755 --- a/src/test/bash/install_vault.sh +++ b/src/test/bash/install_vault.sh @@ -6,7 +6,7 @@ ########################################################################### -VAULT_VER="${VAULT_VER:-0.8.2}" +VAULT_VER="${VAULT_VER:-0.8.3}" UNAME=$(uname -s | tr '[:upper:]' '[:lower:]') VAULT_ZIP="vault_${VAULT_VER}_${UNAME}_amd64.zip" IGNORE_CERTS="${IGNORE_CERTS:-no}"