[ARVADOS] updated: 1.3.0-2586-g167e25373

[Git user]

Summary of changes:
 lib/undelete/cmd_test.go | 9 +++++++++
 1 file changed, 9 insertions(+)

       via  167e2537365ec68fe6be6a330a2eb698f177aa05 (commit)
      from  f4b5558a5ffca754f15a77446f43aed91ed44dae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 167e2537365ec68fe6be6a330a2eb698f177aa05
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Mon Jun 1 09:42:22 2020 -0400

    16427: Fix test order dependency.
    
    Test was incorrectly assuming keep2, keep3 data dirs existed.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/undelete/cmd_test.go b/lib/undelete/cmd_test.go
index 1ea965995..e45152d14 100644
--- a/lib/undelete/cmd_test.go
+++ b/lib/undelete/cmd_test.go
@@ -74,7 +74,16 @@ func (*Suite) TestUntrashAndTouchBlock(c *check.C) {
 	}
 	c.Logf("keepstore datadirs are %q", datadirs)
 
+	// Currently StartKeep(2, true) uses dirs called "keep0" and
+	// "keep1" so we could just put our fake trashed file in keep0
+	// ... but we don't want to rely on arvadostest's
+	// implementation details, so we put a trashed file in every
+	// dir that keepstore might be using.
 	for _, datadir := range datadirs {
+		if fi, err := os.Stat(datadir); err != nil || !fi.IsDir() {
+			c.Logf("skipping datadir %q, evidently neither keepstore is using it", datadir)
+			continue
+		}
 		trashfile := datadir + "/dcd/dcd0348cb2532ee90c99f1b846efaee7.trash.999999999"
 		os.Mkdir(datadir+"/dcd", 0777)
 		err = ioutil.WriteFile(trashfile, []byte("undelete test"), 0777)

-----------------------------------------------------------------------


hooks/post-receive
--