This is an automated email from the ASF dual-hosted git repository.
ocket8888 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 5c23a00 Fix TO API tests with go 1.15 (#4987)
5c23a00 is described below
commit 5c23a002e80289970be357881726cde775121b9c
Author: Steve Hamrick <[email protected]>
AuthorDate: Thu Sep 3 12:08:03 2020 -0600
Fix TO API tests with go 1.15 (#4987)
* Merge
* Delete ssl keys and mark as system test
* Fix with go vet 1.15
* Didnt mean to bring these changes
---
traffic_ops/testing/api/v1/deliveryservices_test.go | 4 ++--
traffic_ops/testing/api/v1/readonlycannotmodify_test.go | 2 +-
traffic_ops/testing/api/v2/deliveryservices_test.go | 4 ++--
traffic_ops/testing/api/v2/readonlycannotmodify_test.go | 2 +-
traffic_ops/testing/api/v3/deliveryservices_test.go | 5 +++--
traffic_ops/testing/api/v3/readonlycannotmodify_test.go | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/traffic_ops/testing/api/v1/deliveryservices_test.go
b/traffic_ops/testing/api/v1/deliveryservices_test.go
index 0332f3e..8dd56f2 100644
--- a/traffic_ops/testing/api/v1/deliveryservices_test.go
+++ b/traffic_ops/testing/api/v1/deliveryservices_test.go
@@ -583,12 +583,12 @@ func DeliveryServiceTenancyTest(t *testing.T) {
}
// assert that tenant4user cannot update tenant3user's deliveryservice
- if _, err =
tenant4TOClient.UpdateDeliveryServiceNullable(string(*tenant3DS.ID),
&tenant3DS); err == nil {
+ if _, err =
tenant4TOClient.UpdateDeliveryServiceNullable(strconv.Itoa(*tenant3DS.ID),
&tenant3DS); err == nil {
t.Errorf("expected tenant4user to be unable to update tenant3's
deliveryservice (%s)", *tenant3DS.XMLID)
}
// assert that tenant4user cannot delete tenant3user's deliveryservice
- if _, err =
tenant4TOClient.DeleteDeliveryService(string(*tenant3DS.ID)); err == nil {
+ if _, err =
tenant4TOClient.DeleteDeliveryService(strconv.Itoa(*tenant3DS.ID)); err == nil {
t.Errorf("expected tenant4user to be unable to delete tenant3's
deliveryservice (%s)", *tenant3DS.XMLID)
}
diff --git a/traffic_ops/testing/api/v1/readonlycannotmodify_test.go
b/traffic_ops/testing/api/v1/readonlycannotmodify_test.go
index 911de59..053f0d2 100644
--- a/traffic_ops/testing/api/v1/readonlycannotmodify_test.go
+++ b/traffic_ops/testing/api/v1/readonlycannotmodify_test.go
@@ -57,7 +57,7 @@ func CreateTestCDNWithReadOnlyUser(t *testing.T) {
}
for _, alert := range alerts.Alerts {
- if alert.Level == string(tc.SuccessLevel) {
+ if alert.Level == tc.SuccessLevel.String() {
t.Errorf("readonlyuser creating cdn, alerts expected:
no success alert, actual: got success alert '" + alert.Text + "'")
}
}
diff --git a/traffic_ops/testing/api/v2/deliveryservices_test.go
b/traffic_ops/testing/api/v2/deliveryservices_test.go
index 4d689d0..d4a8ee7 100644
--- a/traffic_ops/testing/api/v2/deliveryservices_test.go
+++ b/traffic_ops/testing/api/v2/deliveryservices_test.go
@@ -515,12 +515,12 @@ func DeliveryServiceTenancyTest(t *testing.T) {
}
// assert that tenant4user cannot update tenant3user's deliveryservice
- if _, err =
tenant4TOClient.UpdateDeliveryServiceNullable(string(*tenant3DS.ID),
&tenant3DS); err == nil {
+ if _, err =
tenant4TOClient.UpdateDeliveryServiceNullable(strconv.Itoa(*tenant3DS.ID),
&tenant3DS); err == nil {
t.Errorf("expected tenant4user to be unable to update tenant3's
deliveryservice (%s)", *tenant3DS.XMLID)
}
// assert that tenant4user cannot delete tenant3user's deliveryservice
- if _, err =
tenant4TOClient.DeleteDeliveryService(string(*tenant3DS.ID)); err == nil {
+ if _, err =
tenant4TOClient.DeleteDeliveryService(strconv.Itoa(*tenant3DS.ID)); err == nil {
t.Errorf("expected tenant4user to be unable to delete tenant3's
deliveryservice (%s)", *tenant3DS.XMLID)
}
diff --git a/traffic_ops/testing/api/v2/readonlycannotmodify_test.go
b/traffic_ops/testing/api/v2/readonlycannotmodify_test.go
index 0f02f06..4be277f 100644
--- a/traffic_ops/testing/api/v2/readonlycannotmodify_test.go
+++ b/traffic_ops/testing/api/v2/readonlycannotmodify_test.go
@@ -57,7 +57,7 @@ func CreateTestCDNWithReadOnlyUser(t *testing.T) {
}
for _, alert := range alerts.Alerts {
- if alert.Level == string(tc.SuccessLevel) {
+ if alert.Level == tc.SuccessLevel.String() {
t.Errorf("readonlyuser creating cdn, alerts expected:
no success alert, actual: got success alert '" + alert.Text + "'")
}
}
diff --git a/traffic_ops/testing/api/v3/deliveryservices_test.go
b/traffic_ops/testing/api/v3/deliveryservices_test.go
index ac9c6b9..95379cd 100644
--- a/traffic_ops/testing/api/v3/deliveryservices_test.go
+++ b/traffic_ops/testing/api/v3/deliveryservices_test.go
@@ -19,7 +19,6 @@ import (
"encoding/json"
"errors"
"fmt"
- "github.com/apache/trafficcontrol/lib/go-rfc"
"net/http"
"net/url"
"reflect"
@@ -27,6 +26,8 @@ import (
"testing"
"time"
+ "github.com/apache/trafficcontrol/lib/go-rfc"
+
"github.com/apache/trafficcontrol/lib/go-tc"
"github.com/apache/trafficcontrol/lib/go-util"
toclient "github.com/apache/trafficcontrol/traffic_ops/v3-client"
@@ -656,7 +657,7 @@ func DeliveryServiceTenancyTest(t *testing.T) {
}
// assert that tenant4user cannot delete tenant3user's deliveryservice
- if _, err =
tenant4TOClient.DeleteDeliveryService(string(*tenant3DS.ID)); err == nil {
+ if _, err =
tenant4TOClient.DeleteDeliveryService(strconv.Itoa(*tenant3DS.ID)); err == nil {
t.Errorf("expected tenant4user to be unable to delete tenant3's
deliveryservice (%s)", *tenant3DS.XMLID)
}
diff --git a/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
b/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
index eec7222..6fbd044 100644
--- a/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
+++ b/traffic_ops/testing/api/v3/readonlycannotmodify_test.go
@@ -57,7 +57,7 @@ func CreateTestCDNWithReadOnlyUser(t *testing.T) {
}
for _, alert := range alerts.Alerts {
- if alert.Level == string(tc.SuccessLevel) {
+ if alert.Level == tc.SuccessLevel.String() {
t.Errorf("readonlyuser creating cdn, alerts expected:
no success alert, actual: got success alert '" + alert.Text + "'")
}
}
