This is an automated email from the ASF dual-hosted git repository.
pbacsko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-core.git
The following commit(s) were added to refs/heads/master by this push:
new 82b35ad3 [YUNIKORN-2124] Fix incorrect test in
queue_test.go#TestNewConfiguredQueue (#696)
82b35ad3 is described below
commit 82b35ad352b01836ec1730a00fa1884bdde10b8e
Author: brandboat <[email protected]>
AuthorDate: Thu Nov 23 12:51:57 2023 +0100
[YUNIKORN-2124] Fix incorrect test in queue_test.go#TestNewConfiguredQueue
(#696)
Closes: #696
Signed-off-by: Peter Bacsko <[email protected]>
---
pkg/scheduler/objects/queue_test.go | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pkg/scheduler/objects/queue_test.go
b/pkg/scheduler/objects/queue_test.go
index cb6613ef..13306019 100644
--- a/pkg/scheduler/objects/queue_test.go
+++ b/pkg/scheduler/objects/queue_test.go
@@ -2223,7 +2223,7 @@ func TestNewConfiguredQueue(t *testing.T) {
assert.Assert(t, resources.Equals(resourceStruct,
parent.template.GetMaxResource()))
assert.Assert(t, resources.Equals(resourceStruct,
parent.template.GetGuaranteedResource()))
- // case 0: leaf can use template
+ // case 0: managed leaf queue can't use template
leafConfig := configs.QueueConfig{
Name: "leaf_queue",
Parent: false,
@@ -2237,9 +2237,13 @@ func TestNewConfiguredQueue(t *testing.T) {
assert.NilError(t, err, "failed to create queue: %v", err)
assert.Equal(t, childLeaf.QueuePath, "parent_queue.leaf_queue")
assert.Assert(t, childLeaf.template == nil)
- assert.DeepEqual(t, childLeaf.properties,
parent.template.GetProperties())
- assert.Assert(t, resources.Equals(childLeaf.maxResource,
parent.template.GetMaxResource()))
- assert.Assert(t, resources.Equals(childLeaf.guaranteedResource,
parent.template.GetGuaranteedResource()))
+ assert.Assert(t, reflect.DeepEqual(childLeaf.properties,
leafConfig.Properties))
+ childLeafMax, err :=
resources.NewResourceFromConf(leafConfig.Resources.Max)
+ assert.NilError(t, err, "Resource creation failed")
+ assert.Assert(t, resources.Equals(childLeaf.maxResource, childLeafMax))
+ childLeafGuaranteed, err :=
resources.NewResourceFromConf(leafConfig.Resources.Guaranteed)
+ assert.NilError(t, err, "Resource creation failed")
+ assert.Assert(t, resources.Equals(childLeaf.guaranteedResource,
childLeafGuaranteed))
// case 1: non-leaf can't use template but it can inherit template from
parent
NonLeafConfig := configs.QueueConfig{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
