From eafa4d138152aad6ffef9188b4068a5213a3022f Mon Sep 17 00:00:00 2001 From: Simone Gotti Date: Mon, 2 Dec 2019 13:32:57 +0100 Subject: [PATCH] datamanager tests: don't wait for etcd down It is causing some timeout errors since there can be another instance from another test run in parallel started on the same port. --- internal/datamanager/datamanager_test.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/internal/datamanager/datamanager_test.go b/internal/datamanager/datamanager_test.go index 033d462..5d056c9 100644 --- a/internal/datamanager/datamanager_test.go +++ b/internal/datamanager/datamanager_test.go @@ -75,7 +75,6 @@ func TestEtcdReset(t *testing.T) { t.Fatalf("unexpected err: %v", err) } tetcd := setupEtcd(t, etcdDir) - defer shutdownEtcd(tetcd) ctx, cancel := context.WithCancel(context.Background()) @@ -131,9 +130,7 @@ func TestEtcdReset(t *testing.T) { // Reset etcd t.Logf("stopping etcd") shutdownEtcd(tetcd) - if err := tetcd.WaitDown(20 * time.Second); err != nil { - t.Fatalf("unexpected err: %v", err) - } + t.Logf("resetting etcd") os.RemoveAll(etcdDir) t.Logf("starting etcd") @@ -185,7 +182,6 @@ func TestEtcdResetWalsGap(t *testing.T) { t.Fatalf("unexpected err: %v", err) } tetcd := setupEtcd(t, etcdDir) - defer shutdownEtcd(tetcd) ctx, cancel := context.WithCancel(context.Background()) @@ -241,9 +237,7 @@ func TestEtcdResetWalsGap(t *testing.T) { t.Logf("stopping etcd") // Reset etcd shutdownEtcd(tetcd) - if err := tetcd.WaitDown(10 * time.Second); err != nil { - t.Fatalf("unexpected err: %v", err) - } + t.Logf("resetting etcd") os.RemoveAll(etcdDir) t.Logf("starting etcd") @@ -1489,7 +1483,6 @@ func TestExportImport(t *testing.T) { t.Fatalf("unexpected err: %v", err) } tetcd := setupEtcd(t, etcdDir) - defer shutdownEtcd(tetcd) ctx, cancel := context.WithCancel(context.Background()) @@ -1589,9 +1582,7 @@ func TestExportImport(t *testing.T) { t.Logf("stopping etcd") // Reset etcd shutdownEtcd(tetcd) - if err := tetcd.WaitDown(10 * time.Second); err != nil { - t.Fatalf("unexpected err: %v", err) - } + t.Logf("resetting etcd") os.RemoveAll(etcdDir) t.Logf("starting etcd")