You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ra...@apache.org on 2018/11/02 15:06:14 UTC
[trafficcontrol] 05/09: cleanup -- do not use Fatalf!!
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
commit 063a38a5428a5da44b4754823352ad91904468a8
Author: Dan Kirkwood <da...@apache.org>
AuthorDate: Tue Oct 30 11:16:50 2018 -0600
cleanup -- do not use Fatalf!!
---
traffic_ops/client/origin.go | 2 -
.../api/v14/cachegroupsdeliveryservices_test.go | 28 ++---
traffic_ops/testing/api/v14/crconfig_test.go | 10 +-
.../api/v14/deliveryservice_requests_test.go | 2 +-
.../testing/api/v14/deliveryservicematches_test.go | 4 +-
.../testing/api/v14/deliveryservices_test.go | 18 ++--
.../testing/api/v14/deliveryserviceservers_test.go | 20 ++--
.../api/v14/deliveryservicesideligible_test.go | 8 +-
traffic_ops/testing/api/v14/federations_test.go | 29 +++--
traffic_ops/testing/api/v14/profiles_test.go | 19 ++--
traffic_ops/testing/api/v14/regions_test.go | 2 +-
traffic_ops/testing/api/v14/steering_test.go | 22 ++--
.../testing/api/v14/steeringtargets_test.go | 119 ++++++++++-----------
traffic_ops/testing/api/v14/tenants_test.go | 2 +-
traffic_ops/testing/api/v14/user_test.go | 8 +-
.../testing/api/v14/userdeliveryservices_test.go | 56 +++++-----
16 files changed, 169 insertions(+), 180 deletions(-)
diff --git a/traffic_ops/client/origin.go b/traffic_ops/client/origin.go
index 12ef056..9e89d66 100644
--- a/traffic_ops/client/origin.go
+++ b/traffic_ops/client/origin.go
@@ -90,12 +90,10 @@ func (to *Session) CreateOrigin(origin tc.Origin) (*tc.OriginDetailResponse, Req
var remoteAddr net.Addr
reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
- fmt.Printf("Origin before: %+v\n", origin)
err := originIDs(to, &origin)
if err != nil {
return nil, reqInf, err
}
- fmt.Printf("Origin after: %+v\n", origin)
reqBody, err := json.Marshal(origin)
if err != nil {
diff --git a/traffic_ops/testing/api/v14/cachegroupsdeliveryservices_test.go b/traffic_ops/testing/api/v14/cachegroupsdeliveryservices_test.go
index 879441a..4fdc570 100644
--- a/traffic_ops/testing/api/v14/cachegroupsdeliveryservices_test.go
+++ b/traffic_ops/testing/api/v14/cachegroupsdeliveryservices_test.go
@@ -56,23 +56,23 @@ func CreateTestCachegroupsDeliveryServices(t *testing.T) {
dss, _, err := TOSession.GetDeliveryServiceServers()
if err != nil {
- t.Fatalf("cannot GET DeliveryServiceServers: %v\n", err)
+ t.Errorf("cannot GET DeliveryServiceServers: %v\n", err)
}
if len(dss.Response) > 0 {
- t.Fatalf("cannot test cachegroups delivery services: expected no initial delivery service servers, actual %v\n", len(dss.Response))
+ t.Errorf("cannot test cachegroups delivery services: expected no initial delivery service servers, actual %v\n", len(dss.Response))
}
dses, _, err := TOSession.GetDeliveryServices()
if err != nil {
- t.Fatalf("cannot GET DeliveryServices: %v - %v\n", err, dses)
+ t.Errorf("cannot GET DeliveryServices: %v - %v\n", err, dses)
}
clientCGs, _, err := TOSession.GetCacheGroupByName(TestEdgeServerCacheGroupName)
if err != nil {
- t.Fatalf("getting cachegroup: " + err.Error() + "\n")
+ t.Errorf("getting cachegroup: " + err.Error() + "\n")
}
if len(clientCGs) != 1 {
- t.Fatalf("getting cachegroup expected 1, got %v\n", len(clientCGs))
+ t.Errorf("getting cachegroup expected 1, got %v\n", len(clientCGs))
}
clientCG := clientCGs[0]
@@ -85,19 +85,19 @@ func CreateTestCachegroupsDeliveryServices(t *testing.T) {
resp, _, err := TOSession.SetCachegroupDeliveryServices(cgID, dsIDs)
if err != nil {
- t.Fatalf("setting cachegroup delivery services returned error: %v\n", err)
+ t.Errorf("setting cachegroup delivery services returned error: %v\n", err)
}
if len(resp.Response.ServerNames) == 0 {
- t.Fatalf("setting cachegroup delivery services returned success, but no servers set\n")
+ t.Errorf("setting cachegroup delivery services returned success, but no servers set\n")
}
for _, serverName := range resp.Response.ServerNames {
servers, _, err := TOSession.GetServerByHostName(string(serverName))
if err != nil {
- t.Fatalf("getting server: " + err.Error())
+ t.Errorf("getting server: " + err.Error())
}
if len(servers) != 1 {
- t.Fatalf("getting servers: expected 1 got %v\n", len(servers))
+ t.Errorf("getting servers: expected 1 got %v\n", len(servers))
}
server := servers[0]
serverID := server.ID
@@ -113,7 +113,7 @@ func CreateTestCachegroupsDeliveryServices(t *testing.T) {
}
}
if !found {
- t.Fatalf("post succeeded, but didn't assign delivery service %v to server\n", dsID)
+ t.Errorf("post succeeded, but didn't assign delivery service %v to server\n", dsID)
}
}
}
@@ -124,20 +124,20 @@ func DeleteTestCachegroupsDeliveryServices(t *testing.T) {
dss, _, err := TOSession.GetDeliveryServiceServers()
if err != nil {
- t.Fatalf("cannot GET DeliveryServiceServers: %v\n", err)
+ t.Errorf("cannot GET DeliveryServiceServers: %v\n", err)
}
for _, ds := range dss.Response {
_, _, err := TOSession.DeleteDeliveryServiceServer(*ds.DeliveryService, *ds.Server)
if err != nil {
- t.Fatalf("deleting delivery service servers: " + err.Error() + "\n")
+ t.Errorf("deleting delivery service servers: " + err.Error() + "\n")
}
}
dss, _, err = TOSession.GetDeliveryServiceServers()
if err != nil {
- t.Fatalf("cannot GET DeliveryServiceServers: %v\n", err)
+ t.Errorf("cannot GET DeliveryServiceServers: %v\n", err)
}
if len(dss.Response) > 0 {
- t.Fatalf("deleting delivery service servers: delete succeeded, expected empty subsequent get, actual %v\n", len(dss.Response))
+ t.Errorf("deleting delivery service servers: delete succeeded, expected empty subsequent get, actual %v\n", len(dss.Response))
}
}
diff --git a/traffic_ops/testing/api/v14/crconfig_test.go b/traffic_ops/testing/api/v14/crconfig_test.go
index 70fdff6..6d9ed1e 100644
--- a/traffic_ops/testing/api/v14/crconfig_test.go
+++ b/traffic_ops/testing/api/v14/crconfig_test.go
@@ -55,24 +55,24 @@ func UpdateTestCRConfigSnapshot(t *testing.T) {
log.Debugln("UpdateTestCRConfigSnapshot")
if len(testData.CDNs) < 1 {
- t.Fatalf("no cdn test data")
+ t.Errorf("no cdn test data")
}
cdn := testData.CDNs[0].Name
_, err := TOSession.SnapshotCRConfig(cdn)
if err != nil {
- t.Fatalf("SnapshotCRConfig err expected nil, actual %+v", err)
+ t.Errorf("SnapshotCRConfig err expected nil, actual %+v", err)
}
crcBts, _, err := TOSession.GetCRConfig(cdn)
if err != nil {
- t.Fatalf("GetCRConfig err expected nil, actual %+v", err)
+ t.Errorf("GetCRConfig err expected nil, actual %+v", err)
}
crc := tc.CRConfig{}
if err := json.Unmarshal(crcBts, &crc); err != nil {
- t.Fatalf("GetCRConfig bytes expected: valid tc.CRConfig, actual JSON unmarshal err: %+v", err)
+ t.Errorf("GetCRConfig bytes expected: valid tc.CRConfig, actual JSON unmarshal err: %+v", err)
}
if len(crc.DeliveryServices) == 0 {
- t.Fatalf("GetCRConfig len(crc.DeliveryServices) expected: >0, actual: 0")
+ t.Errorf("GetCRConfig len(crc.DeliveryServices) expected: >0, actual: 0")
}
log.Debugln("UpdateTestCRConfigSnapshot() PASSED: ")
diff --git a/traffic_ops/testing/api/v14/deliveryservice_requests_test.go b/traffic_ops/testing/api/v14/deliveryservice_requests_test.go
index cd336b2..0f845da 100644
--- a/traffic_ops/testing/api/v14/deliveryservice_requests_test.go
+++ b/traffic_ops/testing/api/v14/deliveryservice_requests_test.go
@@ -263,7 +263,7 @@ func UpdateTestDeliveryServiceRequests(t *testing.T) {
dsr := testData.DeliveryServiceRequests[dsrGood]
resp, _, err := TOSession.GetDeliveryServiceRequestByXMLID(dsr.DeliveryService.XMLID)
if err != nil {
- t.Fatalf("cannot GET DeliveryServiceRequest by name: %v - %v\n", dsr.DeliveryService.XMLID, err)
+ t.Errorf("cannot GET DeliveryServiceRequest by name: %v - %v\n", dsr.DeliveryService.XMLID, err)
}
if len(resp) == 0 {
t.Fatal("Length of GET DeliveryServiceRequest is 0")
diff --git a/traffic_ops/testing/api/v14/deliveryservicematches_test.go b/traffic_ops/testing/api/v14/deliveryservicematches_test.go
index ef98fa5..892f064 100644
--- a/traffic_ops/testing/api/v14/deliveryservicematches_test.go
+++ b/traffic_ops/testing/api/v14/deliveryservicematches_test.go
@@ -53,7 +53,7 @@ func GetTestDeliveryServiceMatches(t *testing.T) {
log.Debugln("GetTestDeliveryServiceMatches")
dsMatches, _, err := TOSession.GetDeliveryServiceMatches()
if err != nil {
- t.Fatalf("cannot GET DeliveryService matches: %v\n", err)
+ t.Errorf("cannot GET DeliveryService matches: %v\n", err)
}
dsMatchMap := map[tc.DeliveryServiceName][]string{}
@@ -63,7 +63,7 @@ func GetTestDeliveryServiceMatches(t *testing.T) {
for _, ds := range testData.DeliveryServices {
if _, ok := dsMatchMap[tc.DeliveryServiceName(ds.XMLID)]; !ok {
- t.Fatalf("GET DeliveryService matches missing: %v\n", ds.XMLID)
+ t.Errorf("GET DeliveryService matches missing: %v\n", ds.XMLID)
}
}
}
diff --git a/traffic_ops/testing/api/v14/deliveryservices_test.go b/traffic_ops/testing/api/v14/deliveryservices_test.go
index 6fdfdf3..8852167 100644
--- a/traffic_ops/testing/api/v14/deliveryservices_test.go
+++ b/traffic_ops/testing/api/v14/deliveryservices_test.go
@@ -61,12 +61,12 @@ func CreateTestDeliveryServices(t *testing.T) {
}
_, _, err := TOSession.CreateParameter(pl)
if err != nil {
- t.Fatalf("cannot create parameter: %v\n", err)
+ t.Errorf("cannot create parameter: %v\n", err)
}
for _, ds := range testData.DeliveryServices {
_, err = TOSession.CreateDeliveryService(&ds)
if err != nil {
- t.Fatalf("could not CREATE delivery service '%s': %v\n", ds.XMLID, err)
+ t.Errorf("could not CREATE delivery service '%s': %v\n", ds.XMLID, err)
}
}
}
@@ -75,7 +75,7 @@ func GetTestDeliveryServices(t *testing.T) {
failed := false
actualDSes, _, err := TOSession.GetDeliveryServices()
if err != nil {
- t.Fatalf("cannot GET DeliveryServices: %v - %v\n", err, actualDSes)
+ t.Errorf("cannot GET DeliveryServices: %v - %v\n", err, actualDSes)
failed = true
}
actualDSMap := map[string]tc.DeliveryService{}
@@ -100,7 +100,7 @@ func UpdateTestDeliveryServices(t *testing.T) {
dses, _, err := TOSession.GetDeliveryServices()
if err != nil {
failed = true
- t.Fatalf("cannot GET Delivery Services: %v\n", err)
+ t.Errorf("cannot GET Delivery Services: %v\n", err)
}
remoteDS := tc.DeliveryService{}
@@ -114,7 +114,7 @@ func UpdateTestDeliveryServices(t *testing.T) {
}
if !found {
failed = true
- t.Fatalf("GET Delivery Services missing: %v\n", firstDS.XMLID)
+ t.Errorf("GET Delivery Services missing: %v\n", firstDS.XMLID)
}
updatedLongDesc := "something different"
@@ -130,11 +130,11 @@ func UpdateTestDeliveryServices(t *testing.T) {
resp, _, err := TOSession.GetDeliveryService(strconv.Itoa(remoteDS.ID))
if err != nil {
failed = true
- t.Fatalf("cannot GET Delivery Service by ID: %v - %v\n", remoteDS.XMLID, err)
+ t.Errorf("cannot GET Delivery Service by ID: %v - %v\n", remoteDS.XMLID, err)
}
if resp == nil {
failed = true
- t.Fatalf("cannot GET Delivery Service by ID: %v - nil\n", remoteDS.XMLID)
+ t.Errorf("cannot GET Delivery Service by ID: %v - nil\n", remoteDS.XMLID)
}
if resp.LongDesc != updatedLongDesc || resp.MaxDNSAnswers != updatedMaxDNSAnswers {
@@ -215,7 +215,7 @@ func DeleteTestDeliveryServices(t *testing.T) {
failed := false
if err != nil {
failed = true
- t.Fatalf("cannot GET Servers: %v\n", err)
+ t.Errorf("cannot GET Servers: %v\n", err)
}
for _, testDS := range testData.DeliveryServices {
ds := tc.DeliveryService{}
@@ -229,7 +229,7 @@ func DeleteTestDeliveryServices(t *testing.T) {
}
if !found {
failed = true
- t.Fatalf("DeliveryService not found in Traffic Ops: %v\n", ds.XMLID)
+ t.Errorf("DeliveryService not found in Traffic Ops: %v\n", ds.XMLID)
}
delResp, err := TOSession.DeleteDeliveryService(strconv.Itoa(ds.ID))
diff --git a/traffic_ops/testing/api/v14/deliveryserviceservers_test.go b/traffic_ops/testing/api/v14/deliveryserviceservers_test.go
index fd061ab..1fa3e4d 100644
--- a/traffic_ops/testing/api/v14/deliveryserviceservers_test.go
+++ b/traffic_ops/testing/api/v14/deliveryserviceservers_test.go
@@ -54,30 +54,30 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
dses, _, err := TOSession.GetDeliveryServices()
if err != nil {
- t.Fatalf("cannot GET DeliveryServices: %v\n", err)
+ t.Errorf("cannot GET DeliveryServices: %v\n", err)
}
if len(dses) < 1 {
- t.Fatalf("GET DeliveryServices returned no dses, must have at least 1 to test ds-servers")
+ t.Errorf("GET DeliveryServices returned no dses, must have at least 1 to test ds-servers")
}
ds := dses[0]
servers, _, err := TOSession.GetServers()
if err != nil {
- t.Fatalf("cannot GET Servers: %v\n", err)
+ t.Errorf("cannot GET Servers: %v\n", err)
}
if len(servers) < 1 {
- t.Fatalf("GET Servers returned no dses, must have at least 1 to test ds-servers")
+ t.Errorf("GET Servers returned no dses, must have at least 1 to test ds-servers")
}
server := servers[0]
_, err = TOSession.CreateDeliveryServiceServers(ds.ID, []int{server.ID}, true)
if err != nil {
- t.Fatalf("POST delivery service servers: %v\n", err)
+ t.Errorf("POST delivery service servers: %v\n", err)
}
dsServers, _, err := TOSession.GetDeliveryServiceServers()
if err != nil {
- t.Fatalf("GET delivery service servers: %v\n", err)
+ t.Errorf("GET delivery service servers: %v\n", err)
}
found := false
@@ -88,16 +88,16 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
}
}
if !found {
- t.Fatalf("POST delivery service servers returned success, but ds-server not in GET")
+ t.Errorf("POST delivery service servers returned success, but ds-server not in GET")
}
if _, _, err := TOSession.DeleteDeliveryServiceServer(ds.ID, server.ID); err != nil {
- t.Fatalf("DELETE delivery service server: %v\n", err)
+ t.Errorf("DELETE delivery service server: %v\n", err)
}
dsServers, _, err = TOSession.GetDeliveryServiceServers()
if err != nil {
- t.Fatalf("GET delivery service servers: %v\n", err)
+ t.Errorf("GET delivery service servers: %v\n", err)
}
found = false
@@ -108,6 +108,6 @@ func DeleteTestDeliveryServiceServers(t *testing.T) {
}
}
if found {
- t.Fatalf("DELETE delivery service servers returned success, but still in GET")
+ t.Errorf("DELETE delivery service servers returned success, but still in GET")
}
}
diff --git a/traffic_ops/testing/api/v14/deliveryservicesideligible_test.go b/traffic_ops/testing/api/v14/deliveryservicesideligible_test.go
index 26cea53..ad2943f 100644
--- a/traffic_ops/testing/api/v14/deliveryservicesideligible_test.go
+++ b/traffic_ops/testing/api/v14/deliveryservicesideligible_test.go
@@ -50,17 +50,17 @@ func TestDeliveryServicesEligible(t *testing.T) {
func GetTestDeliveryServicesEligible(t *testing.T) {
dses, _, err := TOSession.GetDeliveryServices()
if err != nil {
- t.Fatalf("cannot GET DeliveryServices: %v\n", err)
+ t.Errorf("cannot GET DeliveryServices: %v\n", err)
}
if len(dses) == 0 {
- t.Fatalf("GET DeliveryServices returned no delivery services, need at least 1 to test")
+ t.Errorf("GET DeliveryServices returned no delivery services, need at least 1 to test")
}
dsID := dses[0].ID
servers, _, err := TOSession.GetDeliveryServicesEligible(dsID)
if err != nil {
- t.Fatalf("getting delivery services eligible: %v\n", err)
+ t.Errorf("getting delivery services eligible: %v\n", err)
}
if len(servers) == 0 {
- t.Fatalf("getting delivery services eligible returned no servers\n")
+ t.Errorf("getting delivery services eligible returned no servers\n")
}
}
diff --git a/traffic_ops/testing/api/v14/federations_test.go b/traffic_ops/testing/api/v14/federations_test.go
index 44946c8..6404f74 100644
--- a/traffic_ops/testing/api/v14/federations_test.go
+++ b/traffic_ops/testing/api/v14/federations_test.go
@@ -25,7 +25,6 @@ func TestFederations(t *testing.T) {
CreateTestCDNs(t)
CreateTestTypes(t)
CreateTestTenants(t)
- CreateTestTenants(t)
CreateTestProfiles(t)
CreateTestStatuses(t)
CreateTestDivisions(t)
@@ -57,38 +56,38 @@ func GetTestFederations(t *testing.T) {
log.Debugln("GetTestFederations")
if len(testData.Federations) == 0 {
- t.Fatalf("no federations test data")
+ t.Errorf("no federations test data")
}
feds, _, err := TOSession.AllFederations()
if err != nil {
- t.Fatalf("getting federations: " + err.Error())
+ t.Errorf("getting federations: " + err.Error())
}
if len(feds) != 1 {
- t.Fatalf("federations expected 1, actual: %+v", len(feds))
+ t.Errorf("federations expected 1, actual: %+v", len(feds))
}
fed := feds[0]
if len(fed.Mappings) < 1 {
- t.Fatalf("federation mappings expected <0, actual: 0")
+ t.Errorf("federation mappings expected <0, actual: 0")
}
mapping := fed.Mappings[0]
if mapping.CName == nil {
- t.Fatalf("federation mapping expected cname, actual: nil")
+ t.Errorf("federation mapping expected cname, actual: nil")
}
if mapping.TTL == nil {
- t.Fatalf("federation mapping expected ttl, actual: nil")
+ t.Errorf("federation mapping expected ttl, actual: nil")
}
matched := false
for _, testFed := range testData.Federations {
if testFed.CName == nil {
- t.Fatalf("test federation missing cname!")
+ t.Errorf("test federation missing cname!")
}
if testFed.TTL == nil {
- t.Fatalf("test federation missing ttl!")
+ t.Errorf("test federation missing ttl!")
}
if *mapping.CName != *testFed.CName {
@@ -97,11 +96,11 @@ func GetTestFederations(t *testing.T) {
matched = true
if *mapping.TTL != *testFed.TTL {
- t.Fatalf("federation mapping ttl expected: %v, actual: %v", *testFed.TTL, *mapping.TTL)
+ t.Errorf("federation mapping ttl expected: %v, actual: %v", *testFed.TTL, *mapping.TTL)
}
}
if !matched {
- t.Fatalf("federation mapping expected to match test data, actual: cname %v not in test data", *mapping.CName)
+ t.Errorf("federation mapping expected to match test data, actual: cname %v not in test data", *mapping.CName)
}
log.Debugln("GetTestFederations PASSED")
@@ -111,19 +110,19 @@ func PostTestFederationsDeliveryServices(t *testing.T) {
log.Debugln("PostTestFederationsDeliveryServices")
dses, _, err := TOSession.GetDeliveryServices()
if err != nil {
- t.Fatalf("cannot GET DeliveryServices: %v - %v\n", err, dses)
+ t.Errorf("cannot GET DeliveryServices: %v - %v\n", err, dses)
}
if len(dses) == 0 {
- t.Fatalf("no delivery services, must have at least 1 ds to test federations deliveryservices\n")
+ t.Errorf("no delivery services, must have at least 1 ds to test federations deliveryservices\n")
}
ds := dses[0]
if len(fedIDs) == 0 {
- t.Fatalf("no federations, must have at least 1 federation to test federations deliveryservices\n")
+ t.Errorf("no federations, must have at least 1 federation to test federations deliveryservices\n")
}
fedID := fedIDs[0]
if _, err = TOSession.CreateFederationDeliveryServices(fedID, []int{ds.ID}, true); err != nil {
- t.Fatalf("creating federations delivery services: %v\n", err)
+ t.Errorf("creating federations delivery services: %v\n", err)
}
log.Debugln("PostTestFederationsDeliveryServices PASSED")
}
diff --git a/traffic_ops/testing/api/v14/profiles_test.go b/traffic_ops/testing/api/v14/profiles_test.go
index fac0a20..b5506f3 100644
--- a/traffic_ops/testing/api/v14/profiles_test.go
+++ b/traffic_ops/testing/api/v14/profiles_test.go
@@ -128,22 +128,15 @@ func GetTestProfiles(t *testing.T) {
func GetTestProfilesWithParameters(t *testing.T) {
firstProfile := testData.Profiles[0]
resp, _, err := TOSession.GetProfileByName(firstProfile.Name)
+ if err != nil {
+ t.Errorf("cannot GET Profile by name: %v - %v\n", err, resp)
+ }
if len(resp) > 0 {
respProfile := resp[0]
- resp, _, err := TOSession.GetProfileByID(respProfile.ID)
- if err != nil {
- t.Errorf("cannot GET Profile by name: %v - %v\n", err, resp)
+ respParameters := respProfile.Parameters
+ if len(respParameters) == 0 {
+ t.Errorf("expected a profile with parameters to be retrieved: %v - %v\n", err, respProfile)
}
- if len(resp) > 0 {
- respProfile = resp[0]
- respParameters := respProfile.Parameters
- if len(respParameters) == 0 {
- t.Errorf("expected a profile with parameters to be retrieved: %v - %v\n", err, respParameters)
- }
- }
- }
- if err != nil {
- t.Errorf("cannot GET Profile by name: %v - %v\n", err, resp)
}
}
diff --git a/traffic_ops/testing/api/v14/regions_test.go b/traffic_ops/testing/api/v14/regions_test.go
index f83ba85..c4d0a16 100644
--- a/traffic_ops/testing/api/v14/regions_test.go
+++ b/traffic_ops/testing/api/v14/regions_test.go
@@ -95,7 +95,7 @@ func GetTestRegionsByNamePath(t *testing.T) {
for _, region := range testData.Regions {
_, _, err := TOSession.GetRegionByNamePath(region.Name)
if err != nil {
- t.Fatalf("cannot GET Region by name: %v - %v\n", region.Name, err)
+ t.Errorf("cannot GET Region by name: %v - %v\n", region.Name, err)
}
}
}
diff --git a/traffic_ops/testing/api/v14/steering_test.go b/traffic_ops/testing/api/v14/steering_test.go
index 742e679..6ecfe22 100644
--- a/traffic_ops/testing/api/v14/steering_test.go
+++ b/traffic_ops/testing/api/v14/steering_test.go
@@ -55,42 +55,42 @@ func GetTestSteering(t *testing.T) {
log.Debugln("GetTestSteering")
if len(testData.SteeringTargets) < 1 {
- t.Fatalf("get steering: no steering target test data\n")
+ t.Errorf("get steering: no steering target test data\n")
}
st := testData.SteeringTargets[0]
if st.DeliveryService == nil {
- t.Fatalf("get steering: test data missing ds\n")
+ t.Errorf("get steering: test data missing ds\n")
}
steerings, _, err := TOSession.Steering()
if err != nil {
- t.Fatalf("steering get: getting steering: %v\n", err)
+ t.Errorf("steering get: getting steering: %v\n", err)
}
if len(steerings) != len(testData.SteeringTargets) {
- t.Fatalf("steering get: expected %v actual %v\n", len(testData.SteeringTargets), len(steerings))
+ t.Errorf("steering get: expected %v actual %v\n", len(testData.SteeringTargets), len(steerings))
}
if steerings[0].ClientSteering {
- t.Fatalf("steering get: ClientSteering expected %v actual %v\n", false, true)
+ t.Errorf("steering get: ClientSteering expected %v actual %v\n", false, true)
}
if len(steerings[0].Targets) != 1 {
- t.Fatalf("steering get: Targets expected %v actual %v\n", 1, len(steerings[0].Targets))
+ t.Errorf("steering get: Targets expected %v actual %v\n", 1, len(steerings[0].Targets))
}
if steerings[0].Targets[0].Order != 0 {
- t.Fatalf("steering get: Targets Order expected %v actual %v\n", 0, steerings[0].Targets[0].Order)
+ t.Errorf("steering get: Targets Order expected %v actual %v\n", 0, steerings[0].Targets[0].Order)
}
if testData.SteeringTargets[0].Value != nil && steerings[0].Targets[0].Weight != int32(*testData.SteeringTargets[0].Value) {
- t.Fatalf("steering get: Targets Order expected %v actual %v\n", testData.SteeringTargets[0].Value, steerings[0].Targets[0].Weight)
+ t.Errorf("steering get: Targets Order expected %v actual %v\n", testData.SteeringTargets[0].Value, steerings[0].Targets[0].Weight)
}
if steerings[0].Targets[0].GeoOrder != nil {
- t.Fatalf("steering get: Targets Order expected %v actual %+v\n", nil, *steerings[0].Targets[0].GeoOrder)
+ t.Errorf("steering get: Targets Order expected %v actual %+v\n", nil, *steerings[0].Targets[0].GeoOrder)
}
if steerings[0].Targets[0].Longitude != nil {
- t.Fatalf("steering get: Targets Order expected %v actual %+v\n", nil, *steerings[0].Targets[0].Longitude)
+ t.Errorf("steering get: Targets Order expected %v actual %+v\n", nil, *steerings[0].Targets[0].Longitude)
}
if steerings[0].Targets[0].Latitude != nil {
- t.Fatalf("steering get: Targets Order expected %v actual %+v\n", nil, *steerings[0].Targets[0].Latitude)
+ t.Errorf("steering get: Targets Order expected %v actual %+v\n", nil, *steerings[0].Targets[0].Latitude)
}
log.Debugln("GetTestSteering() PASSED")
}
diff --git a/traffic_ops/testing/api/v14/steeringtargets_test.go b/traffic_ops/testing/api/v14/steeringtargets_test.go
index d6d65fe..385f253 100644
--- a/traffic_ops/testing/api/v14/steeringtargets_test.go
+++ b/traffic_ops/testing/api/v14/steeringtargets_test.go
@@ -26,7 +26,6 @@ func TestSteeringTargets(t *testing.T) {
CreateTestCDNs(t)
CreateTestTypes(t)
CreateTestTenants(t)
- CreateTestTenants(t)
CreateTestProfiles(t)
CreateTestStatuses(t)
CreateTestDivisions(t)
@@ -58,30 +57,30 @@ func CreateTestSteeringTargets(t *testing.T) {
log.Debugln("CreateTestSteeringTargets")
for _, st := range testData.SteeringTargets {
if st.Type == nil {
- t.Fatalf("creating steering target: test data missing type\n")
+ t.Errorf("creating steering target: test data missing type\n")
}
if st.DeliveryService == nil {
- t.Fatalf("creating steering target: test data missing ds\n")
+ t.Errorf("creating steering target: test data missing ds\n")
}
if st.Target == nil {
- t.Fatalf("creating steering target: test data missing target\n")
+ t.Errorf("creating steering target: test data missing target\n")
}
{
respTypes, _, err := TOSession.GetTypeByName(*st.Type)
if err != nil {
- t.Fatalf("creating steering target: getting type: %v\n", err)
+ t.Errorf("creating steering target: getting type: %v\n", err)
} else if len(respTypes) < 1 {
- t.Fatalf("creating steering target: getting type: not found\n")
+ t.Errorf("creating steering target: getting type: not found\n")
}
st.TypeID = util.IntPtr(respTypes[0].ID)
}
{
respDS, _, err := TOSession.GetDeliveryServiceByXMLID(string(*st.DeliveryService))
if err != nil {
- t.Fatalf("creating steering target: getting ds: %v\n", err)
+ t.Errorf("creating steering target: getting ds: %v\n", err)
} else if len(respDS) < 1 {
- t.Fatalf("creating steering target: getting ds: not found\n")
+ t.Errorf("creating steering target: getting ds: not found\n")
}
dsID := uint64(respDS[0].ID)
st.DeliveryServiceID = &dsID
@@ -89,9 +88,9 @@ func CreateTestSteeringTargets(t *testing.T) {
{
respTarget, _, err := TOSession.GetDeliveryServiceByXMLID(string(*st.Target))
if err != nil {
- t.Fatalf("creating steering target: getting target ds: %v\n", err)
+ t.Errorf("creating steering target: getting target ds: %v\n", err)
} else if len(respTarget) < 1 {
- t.Fatalf("creating steering target: getting target ds: not found\n")
+ t.Errorf("creating steering target: getting target ds: not found\n")
}
targetID := uint64(respTarget[0].ID)
st.TargetID = &targetID
@@ -100,7 +99,7 @@ func CreateTestSteeringTargets(t *testing.T) {
resp, _, err := TOSession.CreateSteeringTarget(st)
log.Debugln("Response: ", resp)
if err != nil {
- t.Fatalf("creating steering target: %v\n", err)
+ t.Errorf("creating steering target: %v\n", err)
}
}
log.Debugln("CreateTestSteeringTargets() PASSED")
@@ -110,31 +109,31 @@ func UpdateTestSteeringTargets(t *testing.T) {
log.Debugln("UpdateTestSteeringTargets")
if len(testData.SteeringTargets) < 1 {
- t.Fatalf("updating steering target: no steering target test data\n")
+ t.Errorf("updating steering target: no steering target test data\n")
}
st := testData.SteeringTargets[0]
if st.DeliveryService == nil {
- t.Fatalf("updating steering target: test data missing ds\n")
+ t.Errorf("updating steering target: test data missing ds\n")
}
if st.Target == nil {
- t.Fatalf("updating steering target: test data missing target\n")
+ t.Errorf("updating steering target: test data missing target\n")
}
respDS, _, err := TOSession.GetDeliveryServiceByXMLID(string(*st.DeliveryService))
if err != nil {
- t.Fatalf("updating steering target: getting ds: %v\n", err)
+ t.Errorf("updating steering target: getting ds: %v\n", err)
}
if len(respDS) < 1 {
- t.Fatalf("updating steering target: getting ds: not found\n")
+ t.Errorf("updating steering target: getting ds: not found\n")
}
dsID := respDS[0].ID
sts, _, err := TOSession.GetSteeringTargets(dsID)
if err != nil {
- t.Fatalf("updating steering targets: getting steering target: %v\n", err)
+ t.Errorf("updating steering targets: getting steering target: %v\n", err)
}
if len(sts) < 1 {
- t.Fatalf("updating steering targets: getting steering target: got 0\n")
+ t.Errorf("updating steering targets: getting steering target: got 0\n")
}
st = sts[0]
@@ -146,52 +145,52 @@ func UpdateTestSteeringTargets(t *testing.T) {
_, _, err = TOSession.UpdateSteeringTarget(st)
if err != nil {
- t.Fatalf("updating steering targets: updating: %+v\n", err)
+ t.Errorf("updating steering targets: updating: %+v\n", err)
}
sts, _, err = TOSession.GetSteeringTargets(dsID)
if err != nil {
- t.Fatalf("updating steering targets: getting updated steering target: %v\n", err)
+ t.Errorf("updating steering targets: getting updated steering target: %v\n", err)
}
if len(sts) < 1 {
- t.Fatalf("updating steering targets: getting updated steering target: got 0\n")
+ t.Errorf("updating steering targets: getting updated steering target: got 0\n")
}
actual := sts[0]
if actual.DeliveryServiceID == nil {
- t.Fatalf("steering target update: ds id expected %v actual %v\n", dsID, nil)
+ t.Errorf("steering target update: ds id expected %v actual %v\n", dsID, nil)
} else if *actual.DeliveryServiceID != uint64(dsID) {
- t.Fatalf("steering target update: ds id expected %v actual %v\n", dsID, *actual.DeliveryServiceID)
+ t.Errorf("steering target update: ds id expected %v actual %v\n", dsID, *actual.DeliveryServiceID)
}
if actual.TargetID == nil {
- t.Fatalf("steering target update: ds id expected %v actual %v\n", dsID, nil)
+ t.Errorf("steering target update: ds id expected %v actual %v\n", dsID, nil)
} else if *actual.TargetID != *st.TargetID {
- t.Fatalf("steering target update: ds id expected %v actual %v\n", *st.TargetID, *actual.TargetID)
+ t.Errorf("steering target update: ds id expected %v actual %v\n", *st.TargetID, *actual.TargetID)
}
if actual.TypeID == nil {
- t.Fatalf("steering target update: ds id expected %v actual %v\n", *st.TypeID, nil)
+ t.Errorf("steering target update: ds id expected %v actual %v\n", *st.TypeID, nil)
} else if *actual.TypeID != *st.TypeID {
- t.Fatalf("steering target update: ds id expected %v actual %v\n", *st.TypeID, *actual.TypeID)
+ t.Errorf("steering target update: ds id expected %v actual %v\n", *st.TypeID, *actual.TypeID)
}
if actual.DeliveryService == nil {
- t.Fatalf("steering target update: ds expected %v actual %v\n", *st.DeliveryService, nil)
+ t.Errorf("steering target update: ds expected %v actual %v\n", *st.DeliveryService, nil)
} else if *st.DeliveryService != *actual.DeliveryService {
- t.Fatalf("steering target update: ds name expected %v actual %v\n", *st.DeliveryService, *actual.DeliveryService)
+ t.Errorf("steering target update: ds name expected %v actual %v\n", *st.DeliveryService, *actual.DeliveryService)
}
if actual.Target == nil {
- t.Fatalf("steering target update: target expected %v actual %v\n", *st.Target, nil)
+ t.Errorf("steering target update: target expected %v actual %v\n", *st.Target, nil)
} else if *st.Target != *actual.Target {
- t.Fatalf("steering target update: target expected %v actual %v\n", *st.Target, *actual.Target)
+ t.Errorf("steering target update: target expected %v actual %v\n", *st.Target, *actual.Target)
}
if actual.Type == nil {
- t.Fatalf("steering target update: type expected %v actual %v\n", *st.Type, nil)
+ t.Errorf("steering target update: type expected %v actual %v\n", *st.Type, nil)
} else if *st.Type != *actual.Type {
- t.Fatalf("steering target update: type expected %v actual %v\n", *st.Type, *actual.Type)
+ t.Errorf("steering target update: type expected %v actual %v\n", *st.Type, *actual.Type)
}
if actual.Value == nil {
- t.Fatalf("steering target update: ds expected %v actual %v\n", *st.Value, nil)
+ t.Errorf("steering target update: ds expected %v actual %v\n", *st.Value, nil)
} else if *st.Value != *actual.Value {
- t.Fatalf("steering target update: value expected %v actual %v\n", *st.Value, actual.Value)
+ t.Errorf("steering target update: value expected %v actual %v\n", *st.Value, actual.Value)
}
log.Debugln("UpdateTestSteeringTargets() PASSED")
}
@@ -200,57 +199,57 @@ func GetTestSteeringTargets(t *testing.T) {
log.Debugln("GetTestSteeringTargets")
if len(testData.SteeringTargets) < 1 {
- t.Fatalf("updating steering target: no steering target test data\n")
+ t.Errorf("updating steering target: no steering target test data\n")
}
st := testData.SteeringTargets[0]
if st.DeliveryService == nil {
- t.Fatalf("updating steering target: test data missing ds\n")
+ t.Errorf("updating steering target: test data missing ds\n")
}
respDS, _, err := TOSession.GetDeliveryServiceByXMLID(string(*st.DeliveryService))
if err != nil {
- t.Fatalf("creating steering target: getting ds: %v\n", err)
+ t.Errorf("creating steering target: getting ds: %v\n", err)
} else if len(respDS) < 1 {
- t.Fatalf("steering target get: getting ds: not found\n")
+ t.Errorf("steering target get: getting ds: not found\n")
}
dsID := respDS[0].ID
sts, _, err := TOSession.GetSteeringTargets(dsID)
if err != nil {
- t.Fatalf("steering target get: getting steering target: %v\n", err)
+ t.Errorf("steering target get: getting steering target: %v\n", err)
}
if len(sts) != len(testData.SteeringTargets) {
- t.Fatalf("steering target get: expected %v actual %v\n", len(testData.SteeringTargets), len(sts))
+ t.Errorf("steering target get: expected %v actual %v\n", len(testData.SteeringTargets), len(sts))
}
expected := testData.SteeringTargets[0]
actual := sts[0]
if actual.DeliveryServiceID == nil {
- t.Fatalf("steering target get: ds id expected %v actual %v\n", dsID, nil)
+ t.Errorf("steering target get: ds id expected %v actual %v\n", dsID, nil)
} else if *actual.DeliveryServiceID != uint64(dsID) {
- t.Fatalf("steering target get: ds id expected %v actual %v\n", dsID, *actual.DeliveryServiceID)
+ t.Errorf("steering target get: ds id expected %v actual %v\n", dsID, *actual.DeliveryServiceID)
}
if actual.DeliveryService == nil {
- t.Fatalf("steering target get: ds expected %v actual %v\n", expected.DeliveryService, nil)
+ t.Errorf("steering target get: ds expected %v actual %v\n", expected.DeliveryService, nil)
} else if *expected.DeliveryService != *actual.DeliveryService {
- t.Fatalf("steering target get: ds name expected %v actual %v\n", expected.DeliveryService, actual.DeliveryService)
+ t.Errorf("steering target get: ds name expected %v actual %v\n", expected.DeliveryService, actual.DeliveryService)
}
if actual.Target == nil {
- t.Fatalf("steering target get: target expected %v actual %v\n", expected.Target, nil)
+ t.Errorf("steering target get: target expected %v actual %v\n", expected.Target, nil)
} else if *expected.Target != *actual.Target {
- t.Fatalf("steering target get: target expected %v actual %v\n", expected.Target, actual.Target)
+ t.Errorf("steering target get: target expected %v actual %v\n", expected.Target, actual.Target)
}
if actual.Type == nil {
- t.Fatalf("steering target get: type expected %v actual %v\n", expected.Type, nil)
+ t.Errorf("steering target get: type expected %v actual %v\n", expected.Type, nil)
} else if *expected.Type != *actual.Type {
- t.Fatalf("steering target get: type expected %v actual %v\n", expected.Type, actual.Type)
+ t.Errorf("steering target get: type expected %v actual %v\n", expected.Type, actual.Type)
}
if actual.Value == nil {
- t.Fatalf("steering target get: ds expected %v actual %v\n", expected.Value, nil)
+ t.Errorf("steering target get: ds expected %v actual %v\n", expected.Value, nil)
} else if *expected.Value != *actual.Value {
- t.Fatalf("steering target get: value expected %v actual %v\n", *expected.Value, *actual.Value)
+ t.Errorf("steering target get: value expected %v actual %v\n", *expected.Value, *actual.Value)
}
log.Debugln("GetTestSteeringTargets() PASSED")
}
@@ -260,17 +259,17 @@ func DeleteTestSteeringTargets(t *testing.T) {
dsIDs := []uint64{}
for _, st := range testData.SteeringTargets {
if st.DeliveryService == nil {
- t.Fatalf("deleting steering target: test data missing ds\n")
+ t.Errorf("deleting steering target: test data missing ds\n")
}
if st.Target == nil {
- t.Fatalf("deleting steering target: test data missing target\n")
+ t.Errorf("deleting steering target: test data missing target\n")
}
respDS, _, err := TOSession.GetDeliveryServiceByXMLID(string(*st.DeliveryService))
if err != nil {
- t.Fatalf("deleting steering target: getting ds: %v\n", err)
+ t.Errorf("deleting steering target: getting ds: %v\n", err)
} else if len(respDS) < 1 {
- t.Fatalf("deleting steering target: getting ds: not found\n")
+ t.Errorf("deleting steering target: getting ds: not found\n")
}
dsID := uint64(respDS[0].ID)
st.DeliveryServiceID = &dsID
@@ -279,26 +278,26 @@ func DeleteTestSteeringTargets(t *testing.T) {
respTarget, _, err := TOSession.GetDeliveryServiceByXMLID(string(*st.Target))
if err != nil {
- t.Fatalf("deleting steering target: getting target ds: %v\n", err)
+ t.Errorf("deleting steering target: getting target ds: %v\n", err)
} else if len(respTarget) < 1 {
- t.Fatalf("deleting steering target: getting target ds: not found\n")
+ t.Errorf("deleting steering target: getting target ds: not found\n")
}
targetID := uint64(respTarget[0].ID)
st.TargetID = &targetID
_, _, err = TOSession.DeleteSteeringTarget(int(*st.DeliveryServiceID), int(*st.TargetID))
if err != nil {
- t.Fatalf("deleting steering target: deleting: %+v\n", err)
+ t.Errorf("deleting steering target: deleting: %+v\n", err)
}
}
for _, dsID := range dsIDs {
sts, _, err := TOSession.GetSteeringTargets(int(dsID))
if err != nil {
- t.Fatalf("deleting steering targets: getting steering target: %v\n", err)
+ t.Errorf("deleting steering targets: getting steering target: %v\n", err)
}
if len(sts) != 0 {
- t.Fatalf("deleting steering targets: after delete, getting steering target: expected 0 actual %+v\n", len(sts))
+ t.Errorf("deleting steering targets: after delete, getting steering target: expected 0 actual %+v\n", len(sts))
}
}
log.Debugln("DeleteTestSteeringTargets() PASSED")
diff --git a/traffic_ops/testing/api/v14/tenants_test.go b/traffic_ops/testing/api/v14/tenants_test.go
index 708bd3a..d867364 100644
--- a/traffic_ops/testing/api/v14/tenants_test.go
+++ b/traffic_ops/testing/api/v14/tenants_test.go
@@ -104,6 +104,7 @@ func UpdateTestTenants(t *testing.T) {
func DeleteTestTenants(t *testing.T) {
+ t.Logf("deleting tenants")
t1 := "tenant1"
tenant1, _, err := TOSession.TenantByName(t1)
@@ -133,5 +134,4 @@ func DeleteTestTenants(t *testing.T) {
if err != nil {
t.Errorf("error deleting tenant %s: %v", t1, err)
}
-
}
diff --git a/traffic_ops/testing/api/v14/user_test.go b/traffic_ops/testing/api/v14/user_test.go
index a3b5b41..3239564 100644
--- a/traffic_ops/testing/api/v14/user_test.go
+++ b/traffic_ops/testing/api/v14/user_test.go
@@ -100,20 +100,20 @@ func UpdateTestUsers(t *testing.T) {
func GetTestUsers(t *testing.T) {
_, _, err := TOSession.GetUsers()
if err != nil {
- t.Fatalf("cannot GET users: %v\n", err)
+ t.Errorf("cannot GET users: %v\n", err)
}
}
func GetTestUserCurrent(t *testing.T) {
user, _, err := TOSession.GetUserCurrent()
if err != nil {
- t.Fatalf("cannot GET current user: %v\n", err)
+ t.Errorf("cannot GET current user: %v\n", err)
}
if user.UserName == nil {
- t.Fatalf("current user expected: %v actual: %v\n", SessionUserName, nil)
+ t.Errorf("current user expected: %v actual: %v\n", SessionUserName, nil)
}
if *user.UserName != SessionUserName {
- t.Fatalf("current user expected: %v actual: %v\n", SessionUserName, *user.UserName)
+ t.Errorf("current user expected: %v actual: %v\n", SessionUserName, *user.UserName)
}
}
diff --git a/traffic_ops/testing/api/v14/userdeliveryservices_test.go b/traffic_ops/testing/api/v14/userdeliveryservices_test.go
index c832174..b7b4af1 100644
--- a/traffic_ops/testing/api/v14/userdeliveryservices_test.go
+++ b/traffic_ops/testing/api/v14/userdeliveryservices_test.go
@@ -55,17 +55,17 @@ func CreateTestUsersDeliveryServices(t *testing.T) {
dses, _, err := TOSession.GetDeliveryServices()
if err != nil {
- t.Fatalf("cannot GET DeliveryServices: %v - %v\n", err, dses)
+ t.Errorf("cannot GET DeliveryServices: %v - %v\n", err, dses)
}
if len(dses) == 0 {
- t.Fatalf("no delivery services, must have at least 1 ds to test users_deliveryservices\n")
+ t.Errorf("no delivery services, must have at least 1 ds to test users_deliveryservices\n")
}
users, _, err := TOSession.GetUsers()
if err != nil {
- t.Fatalf("cannot GET users: %v\n", err)
+ t.Errorf("cannot GET users: %v\n", err)
}
if len(users) == 0 {
- t.Fatalf("no users, must have at least 1 user to test users_deliveryservices\n")
+ t.Errorf("no users, must have at least 1 user to test users_deliveryservices\n")
}
dsIDs := []int{}
@@ -83,33 +83,33 @@ func CreateTestUsersDeliveryServices(t *testing.T) {
}
}
if !foundUser {
- t.Fatalf("get users expected: %v actual: missing\n", TestUsersDeliveryServicesUser)
+ t.Errorf("get users expected: %v actual: missing\n", TestUsersDeliveryServicesUser)
}
_, err = TOSession.SetDeliveryServiceUser(userID, dsIDs, true)
if err != nil {
- t.Fatalf("failed to set delivery service users: " + err.Error())
+ t.Errorf("failed to set delivery service users: " + err.Error())
}
userDSes, _, err := TOSession.GetUserDeliveryServices(userID)
if err != nil {
- t.Fatalf("get user delivery services returned error: " + err.Error())
+ t.Errorf("get user delivery services returned error: " + err.Error())
}
if len(userDSes.Response) != len(dsIDs) {
- t.Fatalf("get user delivery services expected %v actual %v\n", len(dsIDs), len(userDSes.Response))
+ t.Errorf("get user delivery services expected %v actual %v\n", len(dsIDs), len(userDSes.Response))
}
actualDSIDMap := map[int]struct{}{}
for _, userDS := range userDSes.Response {
if userDS.ID == nil {
- t.Fatalf("get user delivery services returned a DS with a nil ID\n")
+ t.Errorf("get user delivery services returned a DS with a nil ID\n")
}
actualDSIDMap[*userDS.ID] = struct{}{}
}
for _, dsID := range dsIDs {
if _, ok := actualDSIDMap[dsID]; !ok {
- t.Fatalf("get user delivery services expected %v actual %v\n", dsID, "missing")
+ t.Errorf("get user delivery services expected %v actual %v\n", dsID, "missing")
}
}
}
@@ -119,17 +119,17 @@ func GetTestUsersDeliveryServices(t *testing.T) {
dses, _, err := TOSession.GetDeliveryServices()
if err != nil {
- t.Fatalf("cannot GET DeliveryServices: %v - %v\n", err, dses)
+ t.Errorf("cannot GET DeliveryServices: %v - %v\n", err, dses)
}
if len(dses) == 0 {
- t.Fatalf("no delivery services, must have at least 1 ds to test users_deliveryservices\n")
+ t.Errorf("no delivery services, must have at least 1 ds to test users_deliveryservices\n")
}
users, _, err := TOSession.GetUsers()
if err != nil {
- t.Fatalf("cannot GET users: %v\n", err)
+ t.Errorf("cannot GET users: %v\n", err)
}
if len(users) == 0 {
- t.Fatalf("no users, must have at least 1 user to test users_deliveryservices\n")
+ t.Errorf("no users, must have at least 1 user to test users_deliveryservices\n")
}
dsIDs := []int64{}
@@ -147,28 +147,28 @@ func GetTestUsersDeliveryServices(t *testing.T) {
}
}
if !foundUser {
- t.Fatalf("get users expected: %v actual: missing\n", TestUsersDeliveryServicesUser)
+ t.Errorf("get users expected: %v actual: missing\n", TestUsersDeliveryServicesUser)
}
userDSes, _, err := TOSession.GetUserDeliveryServices(userID)
if err != nil {
- t.Fatalf("get user delivery services returned error: " + err.Error() + "\n")
+ t.Errorf("get user delivery services returned error: " + err.Error() + "\n")
}
if len(userDSes.Response) != len(dsIDs) {
- t.Fatalf("get user delivery services expected %v actual %v\n", len(dsIDs), len(userDSes.Response))
+ t.Errorf("get user delivery services expected %v actual %v\n", len(dsIDs), len(userDSes.Response))
}
actualDSIDMap := map[int]struct{}{}
for _, userDS := range userDSes.Response {
if userDS.ID == nil {
- t.Fatalf("get user delivery services returned a DS with a nil ID\n")
+ t.Errorf("get user delivery services returned a DS with a nil ID\n")
}
actualDSIDMap[*userDS.ID] = struct{}{}
}
for _, dsID := range dsIDs {
if _, ok := actualDSIDMap[int(dsID)]; !ok {
- t.Fatalf("get user delivery services expected %v actual %v\n", dsID, "missing")
+ t.Errorf("get user delivery services expected %v actual %v\n", dsID, "missing")
}
}
}
@@ -178,10 +178,10 @@ func DeleteTestUsersDeliveryServices(t *testing.T) {
users, _, err := TOSession.GetUsers()
if err != nil {
- t.Fatalf("cannot GET users: %v\n", err)
+ t.Errorf("cannot GET users: %v\n", err)
}
if len(users) == 0 {
- t.Fatalf("no users, must have at least 1 user to test users_deliveryservices\n")
+ t.Errorf("no users, must have at least 1 user to test users_deliveryservices\n")
}
userID := 0
foundUser := false
@@ -193,32 +193,32 @@ func DeleteTestUsersDeliveryServices(t *testing.T) {
}
}
if !foundUser {
- t.Fatalf("get users expected: %v actual: missing\n", TestUsersDeliveryServicesUser)
+ t.Errorf("get users expected: %v actual: missing\n", TestUsersDeliveryServicesUser)
}
dses, _, err := TOSession.GetUserDeliveryServices(userID)
if err != nil {
- t.Fatalf("get user delivery services returned error: " + err.Error())
+ t.Errorf("get user delivery services returned error: " + err.Error())
}
if len(dses.Response) == 0 {
- t.Fatalf("get user delivery services expected %v actual %v\n", ">0", "0")
+ t.Errorf("get user delivery services expected %v actual %v\n", ">0", "0")
}
for _, ds := range dses.Response {
if ds.ID == nil {
- t.Fatalf("get user delivery services returned ds with nil ID\n")
+ t.Errorf("get user delivery services returned ds with nil ID\n")
}
_, err := TOSession.DeleteDeliveryServiceUser(userID, *ds.ID)
if err != nil {
- t.Fatalf("delete user delivery service returned error: " + err.Error())
+ t.Errorf("delete user delivery service returned error: " + err.Error())
}
}
dses, _, err = TOSession.GetUserDeliveryServices(userID)
if err != nil {
- t.Fatalf("get user delivery services returned error: " + err.Error())
+ t.Errorf("get user delivery services returned error: " + err.Error())
}
if len(dses.Response) != 0 {
- t.Fatalf("get user delivery services after deleting expected %v actual %v\n", "0", len(dses.Response))
+ t.Errorf("get user delivery services after deleting expected %v actual %v\n", "0", len(dses.Response))
}
}