Skip to content

Commit

Permalink
Merge pull request #1111 from cpu/cpu-temp-fix-bundle-test
Browse files Browse the repository at this point in the history
bundler: temporarily remove `leafRSA3072` testcases.
  • Loading branch information
eiginn committed Jun 10, 2020
2 parents 6b49bea + d384631 commit 2916a1f
Showing 1 changed file with 22 additions and 16 deletions.
38 changes: 22 additions & 16 deletions bundler/bundle_from_file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,16 @@ var fileTests = []fileTest{
errorCallback: nil,
bundleChecking: ExpectBundleLength(3),
},
{
cert: leafRSA3072,
caBundleFile: testCFSSLRootBundle,
intBundleFile: testCFSSLIntBundle,
errorCallback: nil,
bundleChecking: ExpectBundleLength(3),
},
/*
TODO: Re-enable once leafRSA3072 is regenerated with new expiry.
{
cert: leafRSA3072,
caBundleFile: testCFSSLRootBundle,
intBundleFile: testCFSSLIntBundle,
errorCallback: nil,
bundleChecking: ExpectBundleLength(3),
},
*/
{
cert: leafRSA4096,
caBundleFile: testCFSSLRootBundle,
Expand Down Expand Up @@ -170,14 +173,17 @@ var fileTests = []fileTest{
errorCallback: nil,
bundleChecking: ExpectBundleLength(3),
},
{
cert: leafRSA3072,
key: leafKeyRSA3072,
caBundleFile: testCFSSLRootBundle,
intBundleFile: testCFSSLIntBundle,
errorCallback: nil,
bundleChecking: ExpectBundleLength(3),
},
/*
TODO: Re-enable once leafRSA3072 is regenerated with new expiry.
{
cert: leafRSA3072,
key: leafKeyRSA3072,
caBundleFile: testCFSSLRootBundle,
intBundleFile: testCFSSLIntBundle,
errorCallback: nil,
bundleChecking: ExpectBundleLength(3),
},
*/
{
cert: leafRSA4096,
key: leafKeyRSA4096,
Expand Down Expand Up @@ -343,7 +349,7 @@ func TestBundleFromFile(t *testing.T) {
test.errorCallback(t, err)
} else {
if err != nil {
t.Fatalf("expected no error. but an error occurred: %v", err)
t.Fatalf("expected no error bundling %q. but an error occurred: %v", test.cert, err)
}
if test.bundleChecking != nil {
test.bundleChecking(t, bundle)
Expand Down

0 comments on commit 2916a1f

Please sign in to comment.