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