@@ -20,6 +20,7 @@ import (
20
20
"testing"
21
21
22
22
"github.com/stretchr/testify/assert"
23
+ "github.com/stretchr/testify/require"
23
24
24
25
v1 "k8s.io/api/core/v1"
25
26
"k8s.io/apimachinery/pkg/api/equality"
@@ -109,7 +110,7 @@ func TestGetResourceRequest(t *testing.T) {
109
110
as := assert .New (t )
110
111
for idx , tc := range cases {
111
112
actual := GetResourceRequest (tc .pod , tc .resourceName )
112
- as .Equal (actual , tc .expectedValue , "expected test case [%d] %v: to return %q; got %q instead" , idx , tc .cName , tc .expectedValue , actual )
113
+ as .Equal (tc .expectedValue , actual , "expected test case [%d] %v: to return %q; got %q instead" , idx , tc .cName , tc .expectedValue , actual )
113
114
}
114
115
}
115
116
@@ -259,9 +260,9 @@ func TestExtractResourceValue(t *testing.T) {
259
260
for idx , tc := range cases {
260
261
actual , err := ExtractResourceValueByContainerName (tc .fs , tc .pod , tc .cName )
261
262
if tc .expectedError != nil {
262
- as . Equal ( tc . expectedError , err , "expected test case [%d] to fail with error %v; got %v" , idx , tc .expectedError , err )
263
+ require . EqualError ( t , err , tc . expectedError . Error () , "expected test case [%d] to fail with error %v; got %v" , idx , tc .expectedError , err )
263
264
} else {
264
- as . Nil ( err , "expected test case [%d] to not return an error; got %v" , idx , err )
265
+ require . NoError ( t , err , "expected test case [%d] to not return an error; got %v" , idx , err )
265
266
as .Equal (tc .expectedValue , actual , "expected test case [%d] to return %q; got %q instead" , idx , tc .expectedValue , actual )
266
267
}
267
268
}
0 commit comments