From 30ea123f8cd7a956c4caaa3598338c2b93f43c28 Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Tue, 20 Apr 2021 11:01:32 -0700
Subject: [PATCH] Clean up tests
---
network/gateway/hostpool_test.go | 32 ++++++++++++++------------------
network/gateway/sender_test.go | 15 ++++++---------
2 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/network/gateway/hostpool_test.go b/network/gateway/hostpool_test.go
index a460875fc..fdc979827 100644
--- a/network/gateway/hostpool_test.go
+++ b/network/gateway/hostpool_test.go
@@ -50,7 +50,7 @@ func TestNewHostPool(t *testing.T) {
_, err := newHostPool(params, rng, testNdf, manager,
testStorage, addGwChan)
if err != nil {
- t.Errorf("Failed to create mock host pool: %v", err)
+ t.Fatalf("Failed to create mock host pool: %v", err)
}
}
@@ -86,7 +86,7 @@ func TestHostPool_ManageHostPool(t *testing.T) {
testPool, err := newHostPool(params, rng, testNdf, manager,
testStorage, addGwChan)
if err != nil {
- t.Errorf("Failed to create mock host pool: %v", err)
+ t.Fatalf("Failed to create mock host pool: %v", err)
}
// Construct a list of new gateways/nodes to add to ndf
@@ -447,13 +447,12 @@ func TestHostPool_GetPreferred(t *testing.T) {
gwId, err := id.Unmarshal(gw.ID)
if err != nil {
- t.Errorf("Failed to unmarshal ID in mock ndf: %v", err)
+ t.Fatalf("Failed to unmarshal ID in mock ndf: %v", err)
}
// Add mock gateway to manager
_, err = manager.AddHost(gwId, gw.Address, nil, connect.GetDefaultHostParams())
if err != nil {
- t.Errorf("Could not add mock host to manager: %v", err)
- t.FailNow()
+ t.Fatalf("Could not add mock host to manager: %v", err)
}
hostMap[*gwId] = true
@@ -465,7 +464,7 @@ func TestHostPool_GetPreferred(t *testing.T) {
testPool, err := newHostPool(params, rng, testNdf, manager,
testStorage, addGwChan)
if err != nil {
- t.Errorf("Failed to create mock host pool: %v", err)
+ t.Fatalf("Failed to create mock host pool: %v", err)
}
retrievedList := testPool.getPreferred(targets)
@@ -517,13 +516,12 @@ func TestHostPool_GetAny(t *testing.T) {
gwId, err := id.Unmarshal(gw.ID)
if err != nil {
- t.Errorf("Failed to unmarshal ID in mock ndf: %v", err)
+ t.Fatalf("Failed to unmarshal ID in mock ndf: %v", err)
}
// Add mock gateway to manager
_, err = manager.AddHost(gwId, gw.Address, nil, connect.GetDefaultHostParams())
if err != nil {
- t.Errorf("Could not add mock host to manager: %v", err)
- t.FailNow()
+ t.Fatalf("Could not add mock host to manager: %v", err)
}
}
@@ -532,7 +530,7 @@ func TestHostPool_GetAny(t *testing.T) {
testPool, err := newHostPool(params, rng, testNdf, manager,
testStorage, addGwChan)
if err != nil {
- t.Errorf("Failed to create mock host pool: %v", err)
+ t.Fatalf("Failed to create mock host pool: %v", err)
}
requested := 3
@@ -574,13 +572,12 @@ func TestHostPool_ForceAdd(t *testing.T) {
gwId, err := id.Unmarshal(gw.ID)
if err != nil {
- t.Errorf("Failed to unmarshal ID in mock ndf: %v", err)
+ t.Fatalf("Failed to unmarshal ID in mock ndf: %v", err)
}
// Add mock gateway to manager
_, err = manager.AddHost(gwId, gw.Address, nil, connect.GetDefaultHostParams())
if err != nil {
- t.Errorf("Could not add mock host to manager: %v", err)
- t.FailNow()
+ t.Fatalf("Could not add mock host to manager: %v", err)
}
}
@@ -635,13 +632,12 @@ func TestHostPool_UpdateConns_AddGateways(t *testing.T) {
gwId, err := id.Unmarshal(gw.ID)
if err != nil {
- t.Errorf("Failed to unmarshal ID in mock ndf: %v", err)
+ t.Fatalf("Failed to unmarshal ID in mock ndf: %v", err)
}
// Add mock gateway to manager
_, err = manager.AddHost(gwId, gw.Address, nil, connect.GetDefaultHostParams())
if err != nil {
- t.Errorf("Could not add mock host to manager: %v", err)
- t.FailNow()
+ t.Fatalf("Could not add mock host to manager: %v", err)
}
}
@@ -650,7 +646,7 @@ func TestHostPool_UpdateConns_AddGateways(t *testing.T) {
testPool, err := newHostPool(params, rng, testNdf, manager,
testStorage, addGwChan)
if err != nil {
- t.Errorf("Failed to create mock host pool: %v", err)
+ t.Fatalf("Failed to create mock host pool: %v", err)
}
// Construct a list of new gateways/nodes to add to ndf
@@ -725,7 +721,7 @@ func TestHostPool_UpdateConns_RemoveGateways(t *testing.T) {
testPool, err := newHostPool(params, rng, testNdf, manager,
testStorage, addGwChan)
if err != nil {
- t.Errorf("Failed to create mock host pool: %v", err)
+ t.Fatalf("Failed to create mock host pool: %v", err)
}
// Construct a list of new gateways/nodes to add to ndf
diff --git a/network/gateway/sender_test.go b/network/gateway/sender_test.go
index 5b4d50e27..4d67ef980 100644
--- a/network/gateway/sender_test.go
+++ b/network/gateway/sender_test.go
@@ -48,13 +48,12 @@ func TestSender_SendToAny(t *testing.T) {
gwId, err := id.Unmarshal(gw.ID)
if err != nil {
- t.Errorf("Failed to unmarshal ID in mock ndf: %v", err)
+ t.Fatalf("Failed to unmarshal ID in mock ndf: %v", err)
}
// Add mock gateway to manager
_, err = manager.AddHost(gwId, gw.Address, nil, connect.GetDefaultHostParams())
if err != nil {
- t.Errorf("Could not add mock host to manager: %v", err)
- t.FailNow()
+ t.Fatalf("Could not add mock host to manager: %v", err)
}
}
@@ -120,13 +119,12 @@ func TestSender_SendToPreferred(t *testing.T) {
gwId, err := id.Unmarshal(gw.ID)
if err != nil {
- t.Errorf("Failed to unmarshal ID in mock ndf: %v", err)
+ t.Fatalf("Failed to unmarshal ID in mock ndf: %v", err)
}
// Add mock gateway to manager
_, err = manager.AddHost(gwId, gw.Address, nil, connect.GetDefaultHostParams())
if err != nil {
- t.Errorf("Could not add mock host to manager: %v", err)
- t.FailNow()
+ t.Fatalf("Could not add mock host to manager: %v", err)
}
}
@@ -207,13 +205,12 @@ func TestSender_SendToSpecific(t *testing.T) {
gwId, err := id.Unmarshal(gw.ID)
if err != nil {
- t.Errorf("Failed to unmarshal ID in mock ndf: %v", err)
+ t.Fatalf("Failed to unmarshal ID in mock ndf: %v", err)
}
// Add mock gateway to manager
_, err = manager.AddHost(gwId, gw.Address, nil, connect.GetDefaultHostParams())
if err != nil {
- t.Errorf("Could not add mock host to manager: %v", err)
- t.FailNow()
+ t.Fatalf("Could not add mock host to manager: %v", err)
}
}
--
GitLab