Revert "Merge pull request #14609 from vespa-engine/revert-14607-bratseth/adjust-prices-take-2"

This reverts commit 18d75b80db966861d1c4b9a178fed5fef1bca56b, reversing
changes made to 09bf1d5f22a7ae98191c94e9be591994b5125557.

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", "-");
+    }
 
 }