Skip to content

Commit 03aa0c9

Browse files
stlazopenshift-cherrypick-robot
authored and
openshift-cherrypick-robot
committed
fix util package unit tests
1 parent 6ba7171 commit 03aa0c9

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

util/util_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package util
22

33
import (
4-
"testing"
5-
"os"
4+
"encoding/hex"
65
"io/ioutil"
6+
"os"
77
"reflect"
8-
"encoding/hex"
8+
"testing"
99

1010
"github.com/bmizerany/assert"
1111
)
1212

1313
var (
1414
testCA1Subj = "301e311c301a060355040313136f617574682d70726f78792074657374206361"
15-
testCA1 = `-----BEGIN CERTIFICATE-----
15+
testCA1 = `-----BEGIN CERTIFICATE-----
1616
MIICuTCCAaGgAwIBAgIFAKuKEWowDQYJKoZIhvcNAQELBQAwHjEcMBoGA1UEAxMT
1717
b2F1dGgtcHJveHkgdGVzdCBjYTAeFw0xNzEwMjQyMDExMzJaFw0xOTEwMjQyMDEx
1818
MzJaMB4xHDAaBgNVBAMTE29hdXRoLXByb3h5IHRlc3QgY2EwggEiMA0GCSqGSIb3
@@ -31,7 +31,7 @@ pP5YlVqdRCVrxgT80PIMsvQhfcuIrbbeiRDEUdEX7FqebuGCEa2757MTdW7UYQiB
3131
-----END CERTIFICATE-----
3232
`
3333
testCA2Subj = "3025312330210603550403131a6f617574682d70726f7879207365636f6e642074657374206361"
34-
testCA2 = `-----BEGIN CERTIFICATE-----
34+
testCA2 = `-----BEGIN CERTIFICATE-----
3535
MIICxzCCAa+gAwIBAgIFAKuMKewwDQYJKoZIhvcNAQELBQAwJTEjMCEGA1UEAxMa
3636
b2F1dGgtcHJveHkgc2Vjb25kIHRlc3QgY2EwHhcNMTcxMDI1MTYxMTQxWhcNMTkx
3737
MDI1MTYxMTQxWjAlMSMwIQYDVQQDExpvYXV0aC1wcm94eSBzZWNvbmQgdGVzdCBj
@@ -64,18 +64,18 @@ func makeTestCertFile(t *testing.T, pem, dir string) *os.File {
6464
}
6565

6666
func TestGetCertPool(t *testing.T) {
67-
_, err := GetCertPool([]string(nil))
67+
_, err := GetCertPool([]string(nil), false)
6868
if err == nil {
6969
t.Errorf("expected an error")
7070
}
71-
assert.Equal(t, "Invalid empty list of Root CAs file paths" ,err.Error())
71+
assert.Equal(t, "Invalid empty list of Root CAs file paths", err.Error())
7272

7373
tempDir := os.TempDir()
7474
defer os.RemoveAll(tempDir)
7575
certFile1 := makeTestCertFile(t, testCA1, tempDir)
7676
certFile2 := makeTestCertFile(t, testCA2, tempDir)
7777

78-
certPool, err := GetCertPool([]string{certFile1.Name(), certFile2.Name()})
78+
certPool, err := GetCertPool([]string{certFile1.Name(), certFile2.Name()}, false)
7979
if err != nil {
8080
t.Errorf("unexpected error %v", err)
8181
}

0 commit comments

Comments
 (0)