integration: fix cleanup of raft data

The directory used for storage was either changed or new directories were added. Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah · Jul 13, 2019 · 6a64a4d · 6a64a4d
1 parent 47a84dc
commit 6a64a4d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/internal/test/daemon/daemon.go b/internal/test/daemon/daemon.go
@@ -722,9 +722,11 @@ func cleanupRaftDir(t testingT, rootPath string) {
 	if ht, ok := t.(test.HelperT); ok {
 		ht.Helper()
 	}
-	walDir := filepath.Join(rootPath, "swarm/raft/wal")
-	if err := os.RemoveAll(walDir); err != nil {
-		t.Logf("error removing %v: %v", walDir, err)
+	for _, p := range []string{"wal", "wal-v3-encrypted", "snap-v3-encrypted"} {
+		dir := filepath.Join(rootPath, "swarm/raft", p)
+		if err := os.RemoveAll(dir); err != nil {
+			t.Logf("error removing %v: %v", dir, err)
+		}
 	}
 }