@@ -5,75 +5,58 @@ import (
55 "errors"
66 "io"
77 "os"
8+ "path/filepath"
89 "strings"
910 "testing"
1011
1112 "github.com/openshift/cluster-authentication-operator/pkg/cmd/render"
12- "github.com/spf13/afero"
1313)
1414
1515func TestRenderOptionsRun (t * testing.T ) {
1616 type testcase struct {
1717 name string
18- renderOptions * render.RenderOptions
18+ assets render.AssetsFunc
19+ assetsToRender []string
1920 expectedErr error
2021 expectedAssets map [string ][]byte
2122 }
2223
2324 testcases := []testcase {
24- {
25- name : "asset-output-dir can not be created, error" ,
26- renderOptions : & render.RenderOptions {
27- AssetOutputDir : "temp" ,
28- // using a read-only afero.Fs will error on MkdirAll calls
29- Filesystem : afero .NewReadOnlyFs (nil ),
30- Assets : func (name string ) ([]byte , error ) {
31- return nil , nil
32- },
33- AssetsToRender : []string {},
34- },
35- expectedAssets : make (map [string ][]byte ),
36- expectedErr : errors .New ("creating asset-output-dir:" ),
37- },
3825 {
3926 name : "asset-output-dir can be created, fetching asset fails, error" ,
40- renderOptions : & render.RenderOptions {
41- AssetOutputDir : "temp" ,
42- // using a read-only afero.Fs will error on MkdirAll calls
43- Filesystem : afero .NewMemMapFs (),
44- Assets : func (name string ) ([]byte , error ) {
45- return nil , errors .New ("boom" )
46- },
47- AssetsToRender : []string {
48- "foobar" ,
49- },
27+ assets : func (name string ) ([]byte , error ) {
28+ return nil , errors .New ("boom" )
29+ },
30+ assetsToRender : []string {
31+ "foobar" ,
5032 },
5133 expectedAssets : make (map [string ][]byte ),
5234 expectedErr : errors .New ("getting asset \" foobar\" to be rendered:" ),
5335 },
5436 {
5537 name : "asset-output-dir can be created, fetching asset successful, no error, manifest rendered successfully" ,
56- renderOptions : & render.RenderOptions {
57- AssetOutputDir : "temp" ,
58- // using a read-only afero.Fs will error on MkdirAll calls
59- Filesystem : afero .NewMemMapFs (),
60- Assets : func (name string ) ([]byte , error ) {
61- return []byte ("baz" ), nil
62- },
63- AssetsToRender : []string {
64- "foobar" ,
65- },
38+ assets : func (name string ) ([]byte , error ) {
39+ return []byte ("baz" ), nil
40+ },
41+ assetsToRender : []string {
42+ "foobar" ,
6643 },
6744 expectedAssets : map [string ][]byte {
68- "temp/ foobar" : []byte ("baz" ),
45+ "foobar" : []byte ("baz" ),
6946 },
7047 expectedErr : nil ,
7148 },
7249 }
7350
7451 for _ , tc := range testcases {
7552 t .Run (tc .name , func (t * testing.T ) {
76- err := tc .renderOptions .Run ()
53+ tempDir := t .TempDir ()
54+ renderOpts := & render.RenderOptions {
55+ AssetOutputDir : tempDir ,
56+ Assets : tc .assets ,
57+ AssetsToRender : tc .assetsToRender ,
58+ }
59+ err := renderOpts .Run ()
7760 switch {
7861 case err != nil && tc .expectedErr != nil :
7962 if ! strings .Contains (err .Error (), tc .expectedErr .Error ()) {
@@ -86,7 +69,7 @@ func TestRenderOptionsRun(t *testing.T) {
8669 }
8770
8871 for path , contents := range tc .expectedAssets {
89- file , err := tc . renderOptions . Filesystem . Open (path )
72+ file , err := os . Open (filepath . Join ( tempDir , path ) )
9073 if err != nil {
9174 if os .IsNotExist (err ) {
9275 t .Fatalf ("expected rendered manifest %q to exist in filesystem but it does not" , path )
0 commit comments