@@ -18,22 +18,22 @@ func TestProcessWithFlattenedFormat(t *testing.T) {
18
18
Typeflag : tar .TypeDir ,
19
19
Name : "/" ,
20
20
}
21
- bundleAML := & tar.Header {
21
+ bundleYAML := & tar.Header {
22
22
Typeflag : tar .TypeReg ,
23
23
Name : "bundle.yaml" ,
24
24
}
25
25
26
26
workingDirectory , err := ioutil .TempDir ("." , "manifests-" )
27
27
require .NoError (t , err )
28
- defer func (){
28
+ defer func () {
29
29
require .NoError (t , os .RemoveAll (workingDirectory ))
30
30
}()
31
31
32
32
doneGot , errGot := checker .Process (root , "test" , workingDirectory , nil )
33
33
assert .NoError (t , errGot )
34
34
assert .False (t , doneGot )
35
35
36
- doneGot , errGot = checker .Process (bundleAML , "test" , workingDirectory , nil )
36
+ doneGot , errGot = checker .Process (bundleYAML , "test" , workingDirectory , nil )
37
37
assert .NoError (t , errGot )
38
38
assert .False (t , doneGot )
39
39
@@ -45,22 +45,22 @@ func TestProcessWithNestedBundleFormat(t *testing.T) {
45
45
46
46
// Simulate a flattened format as used by Operator Courier
47
47
headers := []* tar.Header {
48
- & tar. Header {Name : "manifests" , Typeflag : tar .TypeDir },
49
- & tar. Header {Name : "manifests/etcd" , Typeflag : tar .TypeDir },
50
- & tar. Header {Name : "manifests/etcd/0.6.1" , Typeflag : tar .TypeDir },
51
- & tar. Header {Name : "manifests/etcd/0.6.1/etcdcluster.crd.yaml" , Typeflag : tar .TypeReg },
52
- & tar. Header {Name : "manifests/etcd/0.6.1/etcdoperator.clusterserviceversion.yaml" , Typeflag : tar .TypeReg },
53
- & tar. Header {Name : "manifests/etcd/etcd.package.yaml" , Typeflag : tar .TypeReg },
48
+ {Name : "manifests" , Typeflag : tar .TypeDir },
49
+ {Name : "manifests/etcd" , Typeflag : tar .TypeDir },
50
+ {Name : "manifests/etcd/0.6.1" , Typeflag : tar .TypeDir },
51
+ {Name : "manifests/etcd/0.6.1/etcdcluster.crd.yaml" , Typeflag : tar .TypeReg },
52
+ {Name : "manifests/etcd/0.6.1/etcdoperator.clusterserviceversion.yaml" , Typeflag : tar .TypeReg },
53
+ {Name : "manifests/etcd/etcd.package.yaml" , Typeflag : tar .TypeReg },
54
54
}
55
55
56
56
workingDirectory , err := ioutil .TempDir ("." , "manifests-" )
57
57
require .NoError (t , err )
58
- defer func (){
58
+ defer func () {
59
59
require .NoError (t , os .RemoveAll (workingDirectory ))
60
60
}()
61
61
62
62
for _ , header := range headers {
63
- doneGot , errGot := checker .Process (header ,"test" , workingDirectory , nil )
63
+ doneGot , errGot := checker .Process (header , "test" , workingDirectory , nil )
64
64
assert .NoError (t , errGot )
65
65
66
66
if checker .IsNestedBundleFormat () {
0 commit comments