From: Simon Ruderich Date: Thu, 1 Aug 2019 21:08:05 +0000 (+0200) Subject: nsscash: go fmt and rewrap comments X-Git-Tag: 0.1~30 X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=3393730a802af2c7d0849287c12f55f35ed6a09b;p=nsscash%2Fnsscash.git nsscash: go fmt and rewrap comments --- diff --git a/main_test.go b/main_test.go index ab5e9b7..2b48bcc 100644 --- a/main_test.go +++ b/main_test.go @@ -221,38 +221,37 @@ func runMainTest(t *testing.T, f func(args)) { groupPath, } - // NOTE: This is not guaranteed to work according to reflect's - // documentation but seems to work reliable for normal - // functions. - fn := runtime.FuncForPC(reflect.ValueOf(f).Pointer()) - name := fn.Name() - name = name[strings.LastIndex(name, ".")+1:] - - t.Run(name, func(t *testing.T) { - // Preparation & cleanup - for _, p := range cleanup { - err := os.Remove(p) - if err != nil && !os.IsNotExist(err) { - t.Fatal(err) - } - // Remove the file at the end of this test - // run, if it was created - defer os.Remove(p) + // NOTE: This is not guaranteed to work according to reflect's + // documentation but seems to work reliable for normal functions. + fn := runtime.FuncForPC(reflect.ValueOf(f).Pointer()) + name := fn.Name() + name = name[strings.LastIndex(name, ".")+1:] + + t.Run(name, func(t *testing.T) { + // Preparation & cleanup + for _, p := range cleanup { + err := os.Remove(p) + if err != nil && !os.IsNotExist(err) { + t.Fatal(err) } + // Remove the file at the end of this test run, if it + // was created + defer os.Remove(p) + } - var handler func(http.ResponseWriter, *http.Request) - ts := httptest.NewServer(http.HandlerFunc( - func(w http.ResponseWriter, r *http.Request) { - handler(w, r) - })) - defer ts.Close() - - f(args{ - t: t, - url: ts.URL, - handler: &handler, - }) + var handler func(http.ResponseWriter, *http.Request) + ts := httptest.NewServer(http.HandlerFunc( + func(w http.ResponseWriter, r *http.Request) { + handler(w, r) + })) + defer ts.Close() + + f(args{ + t: t, + url: ts.URL, + handler: &handler, }) + }) } func fetchPasswdCacheFileDoesNotExist(a args) {