a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Simone Gotti 2019-12-02 13:32:57 +01:00
parent 2232e2895e
commit eafa4d1381
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/datamanager/datamanager_test.go
View File

@ -75,7 +75,6 @@ func TestEtcdReset(t *testing.T) {
t.Fatalf("unexpected err: %v", err) t.Fatalf("unexpected err: %v", err)
} }
tetcd := setupEtcd(t, etcdDir) tetcd := setupEtcd(t, etcdDir)
defer shutdownEtcd(tetcd)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
@ -131,9 +130,7 @@ func TestEtcdReset(t *testing.T) {
// Reset etcd // Reset etcd
t.Logf("stopping etcd") t.Logf("stopping etcd")
shutdownEtcd(tetcd) shutdownEtcd(tetcd)
if err := tetcd.WaitDown(20 * time.Second); err != nil {
t.Fatalf("unexpected err: %v", err)
}
t.Logf("resetting etcd") t.Logf("resetting etcd")
os.RemoveAll(etcdDir) os.RemoveAll(etcdDir)
t.Logf("starting etcd") t.Logf("starting etcd")
@ -185,7 +182,6 @@ func TestEtcdResetWalsGap(t *testing.T) {
t.Fatalf("unexpected err: %v", err) t.Fatalf("unexpected err: %v", err)
} }
tetcd := setupEtcd(t, etcdDir) tetcd := setupEtcd(t, etcdDir)
defer shutdownEtcd(tetcd)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
@ -241,9 +237,7 @@ func TestEtcdResetWalsGap(t *testing.T) {
t.Logf("stopping etcd") t.Logf("stopping etcd")
// Reset etcd // Reset etcd
shutdownEtcd(tetcd) shutdownEtcd(tetcd)
if err := tetcd.WaitDown(10 * time.Second); err != nil {
t.Fatalf("unexpected err: %v", err)
}
t.Logf("resetting etcd") t.Logf("resetting etcd")
os.RemoveAll(etcdDir) os.RemoveAll(etcdDir)
t.Logf("starting etcd") t.Logf("starting etcd")
@ -1489,7 +1483,6 @@ func TestExportImport(t *testing.T) {
t.Fatalf("unexpected err: %v", err) t.Fatalf("unexpected err: %v", err)
} }
tetcd := setupEtcd(t, etcdDir) tetcd := setupEtcd(t, etcdDir)
defer shutdownEtcd(tetcd)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
@ -1589,9 +1582,7 @@ func TestExportImport(t *testing.T) {
t.Logf("stopping etcd") t.Logf("stopping etcd")
// Reset etcd // Reset etcd
shutdownEtcd(tetcd) shutdownEtcd(tetcd)
if err := tetcd.WaitDown(10 * time.Second); err != nil {
t.Fatalf("unexpected err: %v", err)
}
t.Logf("resetting etcd") t.Logf("resetting etcd")
os.RemoveAll(etcdDir) os.RemoveAll(etcdDir)
t.Logf("starting etcd") t.Logf("starting etcd")