Revert "[VOL-3069]Pass Context in methods which are performing logging and need the context"
This reverts commit 3c425fbeabed17ec8dad437678b4d105deaf2fbe.
Reason for revert: Merging higher-priority patches first.
Change-Id: Iaa03a5977357dcd86de358d76e90cc54cd6b1fa5
diff --git a/pkg/mocks/etcd/etcd_server_test.go b/pkg/mocks/etcd/etcd_server_test.go
index b26b262..43c7a42 100644
--- a/pkg/mocks/etcd/etcd_server_test.go
+++ b/pkg/mocks/etcd/etcd_server_test.go
@@ -32,24 +32,23 @@
var client *kvstore.EtcdClient
func setup() {
- ctx := context.Background()
clientPort, err := freeport.GetFreePort()
if err != nil {
- logger.Fatal(ctx, err)
+ logger.Fatal(err)
}
peerPort, err := freeport.GetFreePort()
if err != nil {
- logger.Fatal(ctx, err)
+ logger.Fatal(err)
}
- etcdServer = StartEtcdServer(ctx, MKConfig(ctx, "voltha.mock.test", clientPort, peerPort, "voltha.lib.mocks.etcd", "error"))
+ etcdServer = StartEtcdServer(MKConfig("voltha.mock.test", clientPort, peerPort, "voltha.lib.mocks.etcd", "error"))
if etcdServer == nil {
- logger.Fatal(ctx, "Embedded server failed to start")
+ logger.Fatal("Embedded server failed to start")
}
clientAddr := fmt.Sprintf("localhost:%d", clientPort)
- client, err = kvstore.NewEtcdClient(ctx, clientAddr, 10*time.Second, log.WarnLevel)
+ client, err = kvstore.NewEtcdClient(clientAddr, 10*time.Second, log.WarnLevel)
if err != nil || client == nil {
- etcdServer.Stop(ctx)
- logger.Fatal(ctx, "Failed to create an Etcd client")
+ etcdServer.Stop()
+ logger.Fatal("Failed to create an Etcd client")
}
}
@@ -78,10 +77,10 @@
func shutdown() {
if client != nil {
- client.Close(context.Background())
+ client.Close()
}
if etcdServer != nil {
- etcdServer.Stop(context.Background())
+ etcdServer.Stop()
}
}