X-Git-Url: https://ruderich.org/simon/gitweb/?p=nsscash%2Fnsscash.git;a=blobdiff_plain;f=main_test.go;h=b5fc2ea92c57068ba9dc6016d39dfaa8af7b328c;hp=c4afa7929dbf980489cdde2fa487725d6f4917f1;hb=HEAD;hpb=5f90bfd1ae2fb737d14532d74d93e3f1c1763f99

diff --git a/main_test.go b/main_test.go
index c4afa79..b5fc2ea 100644
--- a/main_test.go
+++ b/main_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2019  Simon Ruderich
+// Copyright (C) 2019-2021  Simon Ruderich
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -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)
 		}
 	}
@@ -218,6 +216,7 @@ func TestMainFetch(t *testing.T) {
 		fetchCannotDeploy,
 		fetchSecondFetchFails,
 		fetchBasicAuth,
+		// TODO: fetchCannotDeployMultiple,
 	}
 
 	// HTTP tests
@@ -327,7 +326,7 @@ func fetchPasswd404(a args) {
 		"status code 404")
 
 	mustNotExist(t, statePath, plainPath, groupPath)
-	mustBeOld(a.t, passwdPath)
+	mustBeOld(t, passwdPath)
 }
 
 func fetchPasswdUnexpected304(a args) {
@@ -345,7 +344,7 @@ func fetchPasswdUnexpected304(a args) {
 		"status code 304 but did not send If-Modified-Since")
 
 	mustNotExist(t, statePath, plainPath, groupPath)
-	mustBeOld(a.t, passwdPath)
+	mustBeOld(t, passwdPath)
 }
 
 func fetchPasswdEmpty(a args) {
@@ -715,6 +714,7 @@ func fetchStateCannotRead(a args) {
 		statePath+": permission denied")
 
 	mustNotExist(t, passwdPath, plainPath, groupPath)
+	mustBeOld(t, statePath)
 }
 
 func fetchStateInvalid(a args) {
@@ -889,7 +889,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)
@@ -967,3 +967,52 @@ ca = "%[4]s"
 	mustNotExist(t, statePath, plainPath, groupPath)
 	mustBeOld(t, passwdPath)
 }
+
+/*
+TODO: implement code for this test
+
+func fetchCannotDeployMultiple(a args) {
+	t := a.t
+	newPlainDir := "testdata/x"
+	newPlainPath := newPlainDir + "/plain"
+	mustWriteConfig(t, fmt.Sprintf(`
+statepath = "%[1]s"
+
+[[file]]
+type = "group"
+url = "%[2]s/group"
+path = "%[3]s"
+
+[[file]]
+type = "plain"
+url = "%[2]s/plain"
+path = "%[4]s"
+`, statePath, a.url, groupPath, newPlainPath))
+	os.Mkdir(newPlainDir, 0755)
+	defer os.RemoveAll(newPlainDir)
+	mustCreate(t, groupPath)
+	mustCreate(t, newPlainPath)
+	mustHaveHash(t, groupPath, "da39a3ee5e6b4b0d3255bfef95601890afd80709")
+
+	*a.handler = func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path == "/group" {
+			fmt.Fprintln(w, "root:x:0:")
+		}
+		if r.URL.Path == "/plain" {
+			fmt.Fprintln(w, "some file")
+		}
+	}
+
+	err := os.Chmod(newPlainDir, 0500)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = mainFetch(configPath)
+	mustBeErrorWithSubstring(t, err,
+		"permission denied")
+
+	mustNotExist(t, statePath, passwdPath, plainPath)
+	mustBeOld(t, groupPath, newPlainPath)
+}
+*/