nsscash: main_test: refactor in preparation for HTTPS

diff --git a/main_test.go b/main_test.go
index 47865651f8e5e8e0dc17f867091e52800dcc6daa..ab5e9b7111399a5d999d1b794712d8e05a31e4c0 100644 (file)
--- a/main_test.go
+++ b/main_test.go
@@ -207,6 +207,12 @@ func TestMainFetch(t *testing.T) {
                fetchSecondFetchFails,
        }
 
                fetchSecondFetchFails,
        }
 

+       for _, f := range tests {
+               runMainTest(t, f)
+       }
+}
+
+func runMainTest(t *testing.T, f func(args)) {

        cleanup := []string{
                configPath,
                statePath,
        cleanup := []string{
                configPath,
                statePath,


@@ -215,7 +221,6 @@ func TestMainFetch(t *testing.T) {
                groupPath,
        }
 
                groupPath,
        }
 

-       for _, f := range tests {

                // NOTE: This is not guaranteed to work according to reflect's
                // documentation but seems to work reliable for normal
                // functions.
                // NOTE: This is not guaranteed to work according to reflect's
                // documentation but seems to work reliable for normal
                // functions.


@@ -248,7 +253,6 @@ func TestMainFetch(t *testing.T) {
                                handler: &handler,
                        })
                })
                                handler: &handler,
                        })
                })

-       }

 }
 
 func fetchPasswdCacheFileDoesNotExist(a args) {
 }
 
 func fetchPasswdCacheFileDoesNotExist(a args) {