This is an automated email from the ASF dual-hosted git repository.
rawlin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 4e8c9b4bd1 Fix Federation and Steering Test Issues (#6936)
4e8c9b4bd1 is described below
commit 4e8c9b4bd1ed98d6333efc96c692d8ad7f8c3d1b
Author: Eric Holguin <[email protected]>
AuthorDate: Thu Jun 30 16:42:00 2022 -0600
Fix Federation and Steering Test Issues (#6936)
* Add sorting for ip validation
* Change overlapping function name
* Check for response length of 2 since steering target test added a prereq
---
traffic_ops/testing/api/v3/federations_test.go | 5 +++++
traffic_ops/testing/api/v3/steering_test.go | 6 +++---
traffic_ops/testing/api/v4/federations_test.go | 5 +++++
traffic_ops/testing/api/v4/steering_test.go | 6 +++---
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/traffic_ops/testing/api/v3/federations_test.go
b/traffic_ops/testing/api/v3/federations_test.go
index 6ae514be90..5a6b6fe56e 100644
--- a/traffic_ops/testing/api/v3/federations_test.go
+++ b/traffic_ops/testing/api/v3/federations_test.go
@@ -18,6 +18,7 @@ package v3
import (
"encoding/json"
"net/http"
+ "sort"
"testing"
"time"
@@ -230,6 +231,10 @@ func validateFederationFields(expectedResp
[]map[string]interface{}) utils.CkReq
for _, federation := range federationResp {
if federation.DeliveryService.String() ==
expectedFed["DeliveryService"] {
assert.RequireEqual(t, 1,
len(federation.Mappings), "expected 1 mapping, got %d",
len(federation.Mappings))
+
sort.Strings(federation.Mappings[0].Resolve4)
+
sort.Strings(federation.Mappings[0].Resolve6)
+
sort.Strings(expectedFed["Resolve4"].([]string))
+
sort.Strings(expectedFed["Resolve6"].([]string))
assert.Exactly(t,
expectedFed["Resolve4"], federation.Mappings[0].Resolve4, "checking federation
resolver mappings, expected: %+v, actual: %+v", expectedFed["Resolve4"],
federation.Mappings[0].Resolve4)
assert.Exactly(t,
expectedFed["Resolve6"], federation.Mappings[0].Resolve6, "checking federation
resolver mappings, expected: %+v, actual: %+v", expectedFed["Resolve6"],
federation.Mappings[0].Resolve6)
}
diff --git a/traffic_ops/testing/api/v3/steering_test.go
b/traffic_ops/testing/api/v3/steering_test.go
index 8b729acac2..b696d1f56d 100644
--- a/traffic_ops/testing/api/v3/steering_test.go
+++ b/traffic_ops/testing/api/v3/steering_test.go
@@ -31,8 +31,8 @@ func TestSteering(t *testing.T) {
"GET": {
"OK when VALID request": {
ClientSession: TOSession,
- Expectations:
utils.CkRequest(utils.NoError(), utils.HasStatus(http.StatusOK),
utils.ResponseHasLength(1),
-
validateSteeringTargetFields(map[string]interface{}{"TargetsLength": 1,
"TargetsOrder": int32(0),
+ Expectations:
utils.CkRequest(utils.NoError(), utils.HasStatus(http.StatusOK),
utils.ResponseHasLength(2),
+
validateSteeringFields(map[string]interface{}{"TargetsLength": 1,
"TargetsOrder": int32(0),
"TargetsGeoOrderPtr":
(*int)(nil), "TargetsLongitudePtr": (*float64)(nil), "TargetsLatitudePtr":
(*float64)(nil), "TargetsWeight": int32(42)})),
},
},
@@ -55,7 +55,7 @@ func TestSteering(t *testing.T) {
})
}
-func validateSteeringTargetFields(expectedResp map[string]interface{})
utils.CkReqFunc {
+func validateSteeringFields(expectedResp map[string]interface{})
utils.CkReqFunc {
return func(t *testing.T, _ toclientlib.ReqInf, resp interface{}, _
tc.Alerts, _ error) {
assert.RequireNotNil(t, resp, "Expected Steering response to
not be nil.")
steeringResp := resp.([]tc.Steering)
diff --git a/traffic_ops/testing/api/v4/federations_test.go
b/traffic_ops/testing/api/v4/federations_test.go
index 72f2543477..8025b6ed0e 100644
--- a/traffic_ops/testing/api/v4/federations_test.go
+++ b/traffic_ops/testing/api/v4/federations_test.go
@@ -18,6 +18,7 @@ package v4
import (
"encoding/json"
"net/http"
+ "sort"
"testing"
"time"
@@ -231,6 +232,10 @@ func validateFederationFields(expectedResp
[]map[string]interface{}) utils.CkReq
for _, federation := range federationResp {
if federation.DeliveryService.String() ==
expectedFed["DeliveryService"] {
assert.RequireEqual(t, 1,
len(federation.Mappings), "expected 1 mapping, got %d",
len(federation.Mappings))
+
sort.Strings(federation.Mappings[0].Resolve4)
+
sort.Strings(federation.Mappings[0].Resolve6)
+
sort.Strings(expectedFed["Resolve4"].([]string))
+
sort.Strings(expectedFed["Resolve6"].([]string))
assert.Exactly(t,
expectedFed["Resolve4"], federation.Mappings[0].Resolve4, "checking federation
resolver mappings, expected: %+v, actual: %+v", expectedFed["Resolve4"],
federation.Mappings[0].Resolve4)
assert.Exactly(t,
expectedFed["Resolve6"], federation.Mappings[0].Resolve6, "checking federation
resolver mappings, expected: %+v, actual: %+v", expectedFed["Resolve6"],
federation.Mappings[0].Resolve6)
}
diff --git a/traffic_ops/testing/api/v4/steering_test.go
b/traffic_ops/testing/api/v4/steering_test.go
index 2925060826..b6e1f0aaac 100644
--- a/traffic_ops/testing/api/v4/steering_test.go
+++ b/traffic_ops/testing/api/v4/steering_test.go
@@ -31,8 +31,8 @@ func TestSteering(t *testing.T) {
"GET": {
"OK when VALID request": {
ClientSession: TOSession,
- Expectations:
utils.CkRequest(utils.NoError(), utils.HasStatus(http.StatusOK),
utils.ResponseHasLength(1),
-
validateSteeringTargetFields(map[string]interface{}{"TargetsLength": 1,
"TargetsOrder": int32(0),
+ Expectations:
utils.CkRequest(utils.NoError(), utils.HasStatus(http.StatusOK),
utils.ResponseHasLength(2),
+
validateSteeringFields(map[string]interface{}{"TargetsLength": 1,
"TargetsOrder": int32(0),
"TargetsGeoOrderPtr":
(*int)(nil), "TargetsLongitudePtr": (*float64)(nil), "TargetsLatitudePtr":
(*float64)(nil), "TargetsWeight": int32(42)})),
},
},
@@ -55,7 +55,7 @@ func TestSteering(t *testing.T) {
})
}
-func validateSteeringTargetFields(expectedResp map[string]interface{})
utils.CkReqFunc {
+func validateSteeringFields(expectedResp map[string]interface{})
utils.CkReqFunc {
return func(t *testing.T, _ toclientlib.ReqInf, resp interface{}, _
tc.Alerts, _ error) {
assert.RequireNotNil(t, resp, "Expected Steering response to
not be nil.")
steeringResp := resp.([]tc.Steering)
