From 95e8230a5c1ce1347a2177b31d876363d0a3b2ec Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Mon, 6 Jun 2016 13:02:06 +0300 Subject: [PATCH] test fixes --- agents/dmtagent_it_test.go | 2 +- cache2go/store.go | 20 +++++++++++++++----- data/conf/samples/cgradmin/cgradmin.json | 4 ++++ general_tests/dest_management_it_test.go | 2 +- general_tests/rpcclient_it_test.go | 2 +- general_tests/suretax_it_test.go | 2 +- general_tests/tp_it_test.go | 2 +- general_tests/tut_smgeneric_it_test.go | 2 +- general_tests/tutorial_local_test.go | 2 +- sessionmanager/data_it_test.go | 2 +- sessionmanager/smg_it_test.go | 2 +- 11 files changed, 28 insertions(+), 14 deletions(-) diff --git a/agents/dmtagent_it_test.go b/agents/dmtagent_it_test.go index b91891107..00882b929 100644 --- a/agents/dmtagent_it_test.go +++ b/agents/dmtagent_it_test.go @@ -204,7 +204,7 @@ func TestDmtAgentTPFromFolder(t *testing.T) { return } attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "tutorial")} - var loadInst engine.LoadInstance + var loadInst utils.LoadInstance if err := apierRpc.Call("ApierV2.LoadTariffPlanFromFolder", attrs, &loadInst); err != nil { t.Error(err) } diff --git a/cache2go/store.go b/cache2go/store.go index d39601b1a..2ed53d5a4 100644 --- a/cache2go/store.go +++ b/cache2go/store.go @@ -3,6 +3,7 @@ package cache2go import ( "encoding/gob" + "log" "os" "path/filepath" "strings" @@ -28,6 +29,11 @@ type cacheStore interface { // easy to be counted exported by prefix type cacheDoubleStore map[string]map[string]interface{} +type KeyValue struct { + Key string + Value interface{} +} + func newDoubleStore() cacheDoubleStore { return make(cacheDoubleStore) } @@ -117,7 +123,7 @@ func (cs cacheDoubleStore) GetKeysForPrefix(prefix string) (keys []string) { func (cs cacheDoubleStore) Save(path string, keys []string) error { // create a the path if err := os.MkdirAll(path, 0766); err != nil { - utils.Logger.Err(":" + err.Error()) + utils.Logger.Info(":" + err.Error()) return err } @@ -134,13 +140,17 @@ func (cs cacheDoubleStore) Save(path string, keys []string) error { dataFile, err := os.Create(filepath.Join(path, fileName) + ".cache") defer dataFile.Close() if err != nil { - utils.Logger.Err(":" + err.Error()) + utils.Logger.Info(":" + err.Error()) } // serialize the data dataEncoder := gob.NewEncoder(dataFile) + log.Print("start: ", fileName) if err := dataEncoder.Encode(data); err != nil { - utils.Logger.Err(":" + err.Error()) + log.Print("err: ", fileName, err) + utils.Logger.Info(":" + err.Error()) + } else { + log.Print("end: ", fileName, err) } }(key, value) } @@ -161,14 +171,14 @@ func (cs cacheDoubleStore) Load(path string, keys []string) error { dataFile, err := os.Open(fileName) defer dataFile.Close() if err != nil { - utils.Logger.Err(": " + err.Error()) + utils.Logger.Info(": " + err.Error()) } val := make(map[string]interface{}) dataDecoder := gob.NewDecoder(dataFile) err = dataDecoder.Decode(&val) if err != nil { - utils.Logger.Err(": " + err.Error()) + utils.Logger.Info(": " + err.Error()) } cs[key] = val }(file, key) diff --git a/data/conf/samples/cgradmin/cgradmin.json b/data/conf/samples/cgradmin/cgradmin.json index 431ad027d..6558abb82 100644 --- a/data/conf/samples/cgradmin/cgradmin.json +++ b/data/conf/samples/cgradmin/cgradmin.json @@ -4,6 +4,10 @@ // Used for cgradmin // Starts rater, scheduler +"general": { + "internal_ttl": "30m", +}, + "listen": { "rpc_json": ":2012", // RPC JSON listening address "rpc_gob": ":2013", // RPC GOB listening address diff --git a/general_tests/dest_management_it_test.go b/general_tests/dest_management_it_test.go index c895241a7..2a35a6fa5 100644 --- a/general_tests/dest_management_it_test.go +++ b/general_tests/dest_management_it_test.go @@ -16,7 +16,7 @@ import ( var destCfgPath string var destCfg *config.CGRConfig var destRPC *rpc.Client -var destLoadInst engine.LoadInstance // Share load information between tests +var destLoadInst utils.LoadInstance // Share load information between tests func TestDestManagInitCfg(t *testing.T) { if !*testIntegration { diff --git a/general_tests/rpcclient_it_test.go b/general_tests/rpcclient_it_test.go index 41747d73f..7256b8365 100644 --- a/general_tests/rpcclient_it_test.go +++ b/general_tests/rpcclient_it_test.go @@ -410,7 +410,7 @@ func TestRPCITStatusBcastCmd(t *testing.T) { } else if stats.LastLoadId != utils.NOT_AVAILABLE { t.Errorf("Received unexpected stats: %+v", stats) } - var loadInst engine.LoadInstance + var loadInst utils.LoadInstance attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "tutorial")} if err := rpcRAL1.Call("ApierV2.LoadTariffPlanFromFolder", attrs, &loadInst); err != nil { t.Error(err) diff --git a/general_tests/suretax_it_test.go b/general_tests/suretax_it_test.go index 43d9575c9..93bf28d9b 100644 --- a/general_tests/suretax_it_test.go +++ b/general_tests/suretax_it_test.go @@ -42,7 +42,7 @@ var tpDir = flag.String("tp_dir", "", "CGR config dir path here") var stiCfg *config.CGRConfig var stiRpc *rpc.Client -var stiLoadInst engine.LoadInstance +var stiLoadInst utils.LoadInstance func TestSTIInitCfg(t *testing.T) { if !*testSureTax { diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go index 03bd8c9d8..d5dcdde68 100644 --- a/general_tests/tp_it_test.go +++ b/general_tests/tp_it_test.go @@ -17,7 +17,7 @@ import ( var tpCfgPath string var tpCfg *config.CGRConfig var tpRPC *rpc.Client -var tpLoadInst engine.LoadInstance // Share load information between tests +var tpLoadInst utils.LoadInstance // Share load information between tests func TestTpInitCfg(t *testing.T) { if !*testIntegration { diff --git a/general_tests/tut_smgeneric_it_test.go b/general_tests/tut_smgeneric_it_test.go index 0c72cada8..e86f6f4bd 100644 --- a/general_tests/tut_smgeneric_it_test.go +++ b/general_tests/tut_smgeneric_it_test.go @@ -34,7 +34,7 @@ import ( var tutSMGCfgPath string var tutSMGCfg *config.CGRConfig var tutSMGRpc *rpc.Client -var smgLoadInst engine.LoadInstance // Share load information between tests +var smgLoadInst utils.LoadInstance // Share load information between tests func TestTutSMGInitCfg(t *testing.T) { if !*testLocal { diff --git a/general_tests/tutorial_local_test.go b/general_tests/tutorial_local_test.go index d57ce2fdd..e43bd94d2 100644 --- a/general_tests/tutorial_local_test.go +++ b/general_tests/tutorial_local_test.go @@ -35,7 +35,7 @@ import ( var tutLocalCfgPath string var tutFsLocalCfg *config.CGRConfig var tutLocalRpc *rpc.Client -var loadInst engine.LoadInstance // Share load information between tests +var loadInst utils.LoadInstance // Share load information between tests func TestTutLocalInitCfg(t *testing.T) { if !*testLocal { diff --git a/sessionmanager/data_it_test.go b/sessionmanager/data_it_test.go index ee73c7f38..c416f6f88 100644 --- a/sessionmanager/data_it_test.go +++ b/sessionmanager/data_it_test.go @@ -74,7 +74,7 @@ func TestSMGDataTPFromFolder(t *testing.T) { return } attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "testtp")} - var loadInst engine.LoadInstance + var loadInst utils.LoadInstance if err := smgRPC.Call("ApierV2.LoadTariffPlanFromFolder", attrs, &loadInst); err != nil { t.Error(err) } diff --git a/sessionmanager/smg_it_test.go b/sessionmanager/smg_it_test.go index b14e4adf0..4c6319a44 100644 --- a/sessionmanager/smg_it_test.go +++ b/sessionmanager/smg_it_test.go @@ -103,7 +103,7 @@ func TestSMGVoiceTPFromFolder(t *testing.T) { return } attrs := &utils.AttrLoadTpFromFolder{FolderPath: path.Join(*dataDir, "tariffplans", "tutorial")} - var loadInst engine.LoadInstance + var loadInst utils.LoadInstance if err := smgRPC.Call("ApierV2.LoadTariffPlanFromFolder", attrs, &loadInst); err != nil { t.Error(err) }