aboutsummaryrefslogtreecommitdiffstats
path: root/client/go/internal/admin/jvm/memory_test.go
diff options
context:
space:
mode:
authorbjormel <bjormel@yahooinc.com>2023-10-26 13:59:28 +0000
committerbjormel <bjormel@yahooinc.com>2023-10-26 13:59:28 +0000
commit567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch)
tree4664a743e166a5e11aee7b9acd70ad8ee2617612 /client/go/internal/admin/jvm/memory_test.go
parente9058b555d4dfea2f6c872d9a677e8678b569569 (diff)
parentbce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff)
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'client/go/internal/admin/jvm/memory_test.go')
-rw-r--r--client/go/internal/admin/jvm/memory_test.go11
1 files changed, 10 insertions, 1 deletions
diff --git a/client/go/internal/admin/jvm/memory_test.go b/client/go/internal/admin/jvm/memory_test.go
index c898606a2db..4a23ecedc18 100644
--- a/client/go/internal/admin/jvm/memory_test.go
+++ b/client/go/internal/admin/jvm/memory_test.go
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package jvm
@@ -41,10 +41,19 @@ func TestConversion(t *testing.T) {
result, err = ParseJvmMemorySpec("17g")
assert.Nil(t, err)
assert.Equal(t, v1, result)
+ result, err = ParseJvmMemorySpec("17G")
+ assert.Nil(t, err)
+ assert.Equal(t, v1, result)
result, err = ParseJvmMemorySpec("17000m")
assert.Nil(t, err)
assert.Equal(t, v2, result)
+ result, err = ParseJvmMemorySpec("17000M")
+ assert.Nil(t, err)
+ assert.Equal(t, v2, result)
result, err = ParseJvmMemorySpec("17000000k")
assert.Nil(t, err)
assert.Equal(t, v3, result)
+ result, err = ParseJvmMemorySpec("17000000K")
+ assert.Nil(t, err)
+ assert.Equal(t, v3, result)
}