X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=main_test.go;h=35845371f6878e7a44c0de11ad58b8390da48916;hb=d946c291618d93e4ab4ad898c1ae317fbe2256e3;hp=31c9e50064f21276776f5e344edc62da53f9aad0;hpb=a8a8f9daebe164d067d004458679dd7e7f0dc087;p=nsscash%2Fnsscash.git

diff --git a/main_test.go b/main_test.go
index 31c9e50..3584537 100644
--- a/main_test.go
+++ b/main_test.go
@@ -156,8 +156,8 @@ func mustMakeOld(t *testing.T, paths ...string) {
 	}
 }
 
-// mustMakeOld verifies that all paths have a modification time in the past,
-// as set by mustMakeOld().
+// mustBeOld verifies that all paths have a modification time in the past, as
+// set by mustMakeOld.
 func mustBeOld(t *testing.T, paths ...string) {
 	for _, p := range paths {
 		i, err := os.Stat(p)
@@ -166,8 +166,7 @@ func mustBeOld(t *testing.T, paths ...string) {
 		}
 
 		mtime := i.ModTime()
-		now := time.Now()
-		if now.Sub(mtime) < time.Hour {
+		if time.Since(mtime) < time.Hour {
 			t.Errorf("%q was recently modified", p)
 		}
 	}
@@ -182,8 +181,7 @@ func mustBeNew(t *testing.T, paths ...string) {
 		}
 
 		mtime := i.ModTime()
-		now := time.Now()
-		if now.Sub(mtime) > time.Hour {
+		if time.Since(mtime) > time.Hour {
 			t.Errorf("%q was not recently modified", p)
 		}
 	}
@@ -198,6 +196,7 @@ func TestMainFetch(t *testing.T) {
 		// Perform most tests with passwd for simplicity
 		fetchPasswdCacheFileDoesNotExist,
 		fetchPasswd404,
+		fetchPasswdUnexpected304,
 		fetchPasswdEmpty,
 		fetchPasswdInvalid,
 		fetchPasswdLimits,
@@ -326,7 +325,25 @@ func fetchPasswd404(a args) {
 		"status code 404")
 
 	mustNotExist(t, statePath, plainPath, groupPath)
-	mustBeOld(a.t, passwdPath)
+	mustBeOld(t, passwdPath)
+}
+
+func fetchPasswdUnexpected304(a args) {
+	t := a.t
+	mustWritePasswdConfig(t, a.url)
+	mustCreate(t, passwdPath)
+
+	*a.handler = func(w http.ResponseWriter, r *http.Request) {
+		// 304
+		w.WriteHeader(http.StatusNotModified)
+	}
+
+	err := mainFetch(configPath)
+	mustBeErrorWithSubstring(t, err,
+		"status code 304 but did not send If-Modified-Since")
+
+	mustNotExist(t, statePath, plainPath, groupPath)
+	mustBeOld(t, passwdPath)
 }
 
 func fetchPasswdEmpty(a args) {
@@ -696,6 +713,7 @@ func fetchStateCannotRead(a args) {
 		statePath+": permission denied")
 
 	mustNotExist(t, passwdPath, plainPath, groupPath)
+	mustBeOld(t, statePath)
 }
 
 func fetchStateInvalid(a args) {
@@ -870,7 +888,7 @@ password = "%[6]s"
 	err = mainFetch(configPath)
 	mustBeErrorWithSubstring(t, err,
 		"file[0].username/passsword in use and unsafe permissions "+
-			"-rw-r--r-- on \"testdata/config.toml\"")
+			"-rw-r--r-- on \""+configPath+"\"")
 
 	mustNotExist(t, statePath, groupPath, plainPath)
 	mustBeOld(t, passwdPath)