From 340300f2db1b622bc448414e7b349d4042b72973 Mon Sep 17 00:00:00 2001 From: DanB Date: Wed, 10 Sep 2014 18:25:21 +0200 Subject: [PATCH] Sleep after pkill in local tests so the sockets are freed --- apier/apier_local_test.go | 1 + apier/cdrstatsv1_local_test.go | 2 +- engine/mediator_local_test.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apier/apier_local_test.go b/apier/apier_local_test.go index 7056f776a..a4bb12abd 100644 --- a/apier/apier_local_test.go +++ b/apier/apier_local_test.go @@ -140,6 +140,7 @@ func TestStartEngine(t *testing.T) { t.Fatal("Cannot find cgr-engine executable") } exec.Command("pkill", "cgr-engine").Run() // Just to make sure another one is not running, bit brutal maybe we can fine tune it + time.Sleep(time.Duration(*waitRater) * time.Millisecond) engine := exec.Command(enginePath, "-config", cfgPath) if err := engine.Start(); err != nil { t.Fatal("Cannot start cgr-engine: ", err.Error()) diff --git a/apier/cdrstatsv1_local_test.go b/apier/cdrstatsv1_local_test.go index a8c4d0836..4f4f38eab 100644 --- a/apier/cdrstatsv1_local_test.go +++ b/apier/cdrstatsv1_local_test.go @@ -40,7 +40,6 @@ var cdrstRpc *rpc.Client func init() { cdrstCfgPath = path.Join(*dataDir, "conf", "samples", "cdrstatsv1_local_test.cfg") cdrstCfg, _ = config.NewCGRConfigFromFile(&cdrstCfgPath) - //fmt.Printf("CdrstCfg: %+v\n", cdrstCfg) } func TestCDRStatsLclInitDataDb(t *testing.T) { @@ -73,6 +72,7 @@ func TestCDRStatsLclStartEngine(t *testing.T) { t.Fatal("Cannot find cgr-engine executable") } exec.Command("pkill", "cgr-engine").Run() // Just to make sure another one is not running, bit brutal maybe we can fine tune it + time.Sleep(time.Duration(*waitRater) * time.Millisecond) engine := exec.Command(enginePath, "-config", cdrstCfgPath) if err := engine.Start(); err != nil { t.Fatal("Cannot start cgr-engine: ", err.Error()) diff --git a/engine/mediator_local_test.go b/engine/mediator_local_test.go index c19107453..96188cd42 100644 --- a/engine/mediator_local_test.go +++ b/engine/mediator_local_test.go @@ -111,6 +111,7 @@ func TestStartEngine(t *testing.T) { t.Fatal("Cannot find cgr-engine executable") } exec.Command("pkill", "cgr-engine").Run() // Just to make sure another one is not running, bit brutal maybe we can fine tune it + time.Sleep(time.Duration(*startDelay) * time.Millisecond) engine := exec.Command(enginePath, "-config", cfgPath) if err := engine.Start(); err != nil { t.Fatal("Cannot start cgr-engine: ", err.Error())