This is an automated email from the ASF dual-hosted git repository.
mitchell852 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 9003567 Fix broken unit tests and run go fmt (#3979)
9003567 is described below
commit 9003567785f2608c31faa6c52fea74f704cc59c3
Author: Michael Hoppal <[email protected]>
AuthorDate: Thu Oct 10 20:05:43 2019 -0600
Fix broken unit tests and run go fmt (#3979)
---
lib/go-tc/invalidationjobs_test.go | 10 +++++++---
lib/go-util/ptr.go | 4 ++++
traffic_ops/testing/api/v14/jobs_test.go | 4 ++--
.../traffic_ops_golang/invalidationjobs/invalidationjobs.go | 4 ++--
.../invalidationjobs/userinvalidationjobs.go | 6 +++---
5 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/lib/go-tc/invalidationjobs_test.go
b/lib/go-tc/invalidationjobs_test.go
index 41ed52e..0c8d3cf 100644
--- a/lib/go-tc/invalidationjobs_test.go
+++ b/lib/go-tc/invalidationjobs_test.go
@@ -19,10 +19,14 @@ package tc
* under the License.
*/
-import "fmt"
+import (
+ "fmt"
+
+ "github.com/apache/trafficcontrol/lib/go-util"
+)
func ExampleInvalidationJobInput_TTLHours_duration() {
- j := InvalidationJobInput{nil, nil, nil, "121m"}
+ j := InvalidationJobInput{nil, nil, nil, util.InterfacePtr("121m"),
nil, nil}
ttl, e := j.TTLHours()
if e != nil {
fmt.Printf("Error: %v\n", e)
@@ -32,7 +36,7 @@ func ExampleInvalidationJobInput_TTLHours_duration() {
}
func ExampleInvalidationJobInput_TTLHours_number() {
- j := InvalidationJobInput{nil, nil, nil, 2.1}
+ j := InvalidationJobInput{nil, nil, nil, util.InterfacePtr(2.1), nil,
nil}
ttl, e := j.TTLHours()
if e != nil {
fmt.Printf("Error: %v\n", e)
diff --git a/lib/go-util/ptr.go b/lib/go-util/ptr.go
index 65ca535..eb79583 100644
--- a/lib/go-util/ptr.go
+++ b/lib/go-util/ptr.go
@@ -42,3 +42,7 @@ func BoolPtr(b bool) *bool {
func FloatPtr(f float64) *float64 {
return &f
}
+
+func InterfacePtr(i interface{}) *interface{} {
+ return &i
+}
diff --git a/traffic_ops/testing/api/v14/jobs_test.go
b/traffic_ops/testing/api/v14/jobs_test.go
index b579fef..68d44ad 100644
--- a/traffic_ops/testing/api/v14/jobs_test.go
+++ b/traffic_ops/testing/api/v14/jobs_test.go
@@ -144,9 +144,9 @@ func GetTestInvalidationJobs(t *testing.T) {
}
}
- for _,testJob := range testData.InvalidationJobs {
+ for _, testJob := range testData.InvalidationJobs {
found := false
- for _,toJob := range jobs {
+ for _, toJob := range jobs {
if *toJob.DeliveryService !=
(*testJob.DeliveryService).(string) {
continue
}
diff --git
a/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go
b/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go
index c869b18..684c64b 100644
--- a/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go
+++ b/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go
@@ -354,7 +354,7 @@ func Create(w http.ResponseWriter, r *http.Request) {
}
if ok, err := IsUserAuthorizedToModifyDSID(inf, dsid); err != nil {
- sysErr = fmt.Errorf("Checking current user permissions for DS
#%d: %v")
+ sysErr = fmt.Errorf("Checking current user permissions for DS
#%d: %v", dsid, err)
errCode = http.StatusInternalServerError
api.HandleErr(w, r, inf.Tx.Tx, errCode, nil, sysErr)
return
@@ -602,7 +602,7 @@ func Delete(w http.ResponseWriter, r *http.Request) {
}
if ok, err := IsUserAuthorizedToModifyJobsMadeByUserID(inf, createdBy);
err != nil {
- sysErr = fmt.Errorf("Checking user permissions against user %s:
%v", createdBy, err)
+ sysErr = fmt.Errorf("Checking user permissions against user %v:
%v", createdBy, err)
errCode = http.StatusInternalServerError
api.HandleErr(w, r, inf.Tx.Tx, errCode, nil, sysErr)
return
diff --git
a/traffic_ops/traffic_ops_golang/invalidationjobs/userinvalidationjobs.go
b/traffic_ops/traffic_ops_golang/invalidationjobs/userinvalidationjobs.go
index f75dc6e..f471b5e 100644
--- a/traffic_ops/traffic_ops_golang/invalidationjobs/userinvalidationjobs.go
+++ b/traffic_ops/traffic_ops_golang/invalidationjobs/userinvalidationjobs.go
@@ -54,7 +54,7 @@ WHERE job.job_user=$1
`
type response struct {
- Alerts []tc.Alert `json:"alerts"`
+ Alerts []tc.Alert `json:"alerts"`
Response interface{} `json:"response"`
}
@@ -118,7 +118,7 @@ func CreateUserJob(w http.ResponseWriter, r *http.Request) {
[]tc.Alert{
tc.Alert{
Level: tc.SuccessLevel.String(),
- Text: "Invalidation Job creation was
successful.",
+ Text: "Invalidation Job creation was
successful.",
},
api.DeprecationWarning("POST /jobs"),
},
@@ -199,7 +199,7 @@ func GetUserJobs(w http.ResponseWriter, r *http.Request) {
}
type userResponse struct {
- Alerts []tc.Alert `json:"alerts"`
+ Alerts []tc.Alert `json:"alerts"`
Response []tc.UserInvalidationJob `json:"response"`
}
