diff options
| author | Sebastiaan van Stijn <github@gone.nl> | 2019-07-12 12:11:05 +0200 |
|---|---|---|
| committer | Sebastiaan van Stijn <github@gone.nl> | 2019-07-13 13:23:57 +0200 |
| commit | 6a64a4deecf5b7519d3748023765f79628059f80 (patch) | |
| tree | e28a1ceac95e6e8ca8bb6e859d1b0c6b065fd057 /internal | |
| parent | 47a84dcc6420beb0dbc2380b28a40e6a3ae32849 (diff) | |
| download | docker-6a64a4deecf5b7519d3748023765f79628059f80.tar.gz | |
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 <github@gone.nl>
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/test/daemon/daemon.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/internal/test/daemon/daemon.go b/internal/test/daemon/daemon.go index cca2c078fe..e6ab7f3969 100644 --- 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) + } } } |