diff options
author | Kristian Aune <kkraune@users.noreply.github.com> | 2020-09-29 07:44:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-29 07:44:39 +0200 |
commit | b8dcc910a0b63671e95ede3f350be4fd39a91e9c (patch) | |
tree | db29615090e57241998ec0deb1c55a49632c3623 /config-model | |
parent | 8884e08b3b394e19901b8bbde5c6889b75e772f1 (diff) | |
parent | 678dbcd6b143f33060278dc581dc59deed9f746e (diff) |
Merge pull request #14607 from vespa-engine/bratseth/adjust-prices-take-2
Bratseth/adjust prices take 2
Diffstat (limited to 'config-model')
2 files changed, 7 insertions, 2 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java index 10199bfe6b9..3e42cbed9b1 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/QuotaValidatorTest.java @@ -42,7 +42,8 @@ public class QuotaValidatorTest { tester.deploy(null, getServices("testCluster", 10), Environment.prod, null); fail(); } catch (RuntimeException e) { - assertEquals("Hourly spend for maximum specified resources ($1.60) exceeds budget from quota ($1.00)!", e.getMessage()); + assertEquals("Hourly spend for maximum specified resources ($-.--) exceeds budget from quota ($-.--)!", + ValidationTester.censorNumbers(e.getMessage())); } } @@ -62,4 +63,6 @@ public class QuotaValidatorTest { " </content>" + "</services>"; } + + } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java index 6961ffa682b..2b3b1a9fcc7 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java @@ -96,6 +96,8 @@ public class ValidationTester { return new Pair<>(newModel, newModelCreator.configChangeActions); } - + public static String censorNumbers(String s) { + return s.replaceAll("\\d", "-"); + } } |