Update integration test for services

This commit is contained in:
TeoV
2020-01-30 10:52:30 +02:00
committed by Dan Christian Bogos
parent 5cf8306f42
commit 1947bef4ae
4 changed files with 109 additions and 28 deletions

View File

@@ -65,12 +65,10 @@ func TestCdrsReload(t *testing.T) {
stordb := NewStorDBService(cfg)
chrS := NewChargerService(cfg, db, chS, filterSChan, server, nil, nil)
schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
ralS := NewRalService(cfg, db, stordb, chS, filterSChan, server,
ralS := NewRalService(cfg, chS, server,
make(chan rpcclient.ClientConnector, 1),
make(chan rpcclient.ClientConnector, 1),
make(chan rpcclient.ClientConnector, 1),
make(chan rpcclient.ClientConnector, 1),
schS, engineShutdown, nil)
engineShutdown, nil)
cdrS := NewCDRServer(cfg, db, stordb, filterSChan, server,
make(chan rpcclient.ClientConnector, 1),
nil)

View File

@@ -81,9 +81,111 @@ func TestDataDBReload(t *testing.T) {
DataDbName: "10",
DataDbUser: "cgrates",
QueryTimeout: 10 * time.Second,
Items: map[string]*config.ItemOpt{
utils.MetaAccounts: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaReverseDestinations: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaDestinations: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaRatingPlans: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaRatingProfiles: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaActions: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaActionPlans: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaAccountActionPlans: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaActionTriggers: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaSharedGroups: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaTimings: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaResourceProfile: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaStatQueues: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaResources: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaStatQueueProfiles: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaThresholds: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaThresholdProfiles: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaFilters: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaSupplierProfiles: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaAttributeProfiles: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaDispatcherHosts: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaChargerProfiles: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaDispatcherProfiles: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaFilterIndexes: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
utils.MetaLoadIDs: &config.ItemOpt{
Replicate: false,
Remote: false,
TTL: time.Duration(0)},
},
}
if !reflect.DeepEqual(oldcfg, db.oldDBCfg) {
t.Errorf("Expected %s received:%s", utils.ToJSON(oldcfg), utils.ToJSON(db.oldDBCfg))
t.Errorf("Expected %s \n received:%s", utils.ToJSON(oldcfg), utils.ToJSON(db.oldDBCfg))
}
cfg.AttributeSCfg().Enabled = false
cfg.GetReloadChan(config.DATADB_JSN) <- struct{}{}

View File

@@ -65,12 +65,10 @@ func TestRalsReload(t *testing.T) {
stordb := NewStorDBService(cfg)
schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
tS := NewThresholdService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1))
ralS := NewRalService(cfg, db, stordb, chS, filterSChan, server,
ralS := NewRalService(cfg, chS, server,
make(chan rpcclient.ClientConnector, 1),
make(chan rpcclient.ClientConnector, 1),
make(chan rpcclient.ClientConnector, 1),
make(chan rpcclient.ClientConnector, 1),
schS, engineShutdown, nil)
engineShutdown, nil)
srvMngr.AddServices(ralS, schS, tS,
NewLoaderService(cfg, db, filterSChan, server, engineShutdown, make(chan rpcclient.ClientConnector, 1), nil), db, stordb)
if err = srvMngr.StartServices(); err != nil {
@@ -99,14 +97,6 @@ func TestRalsReload(t *testing.T) {
t.Errorf("Expected service to be running")
}
if apiv1 := ralS.GetAPIv1(); !apiv1.IsRunning() {
t.Errorf("Expected service to be running")
}
if apiv2 := ralS.GetAPIv2(); !apiv2.IsRunning() {
t.Errorf("Expected service to be running")
}
if resp := ralS.GetResponder(); !resp.IsRunning() {
t.Errorf("Expected service to be running")
}
@@ -124,14 +114,6 @@ func TestRalsReload(t *testing.T) {
t.Errorf("Expected service to be down")
}
if apiv1 := ralS.GetAPIv1(); apiv1.IsRunning() {
t.Errorf("Expected service to be down")
}
if apiv2 := ralS.GetAPIv2(); apiv2.IsRunning() {
t.Errorf("Expected service to be down")
}
if resp := ralS.GetResponder(); resp.IsRunning() {
t.Errorf("Expected service to be down")
}

View File

@@ -72,10 +72,9 @@ func TestSessionSReload(t *testing.T) {
stordb := NewStorDBService(cfg)
chrS := NewChargerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
schS := NewSchedulerService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil)
ralS := NewRalService(cfg, db, stordb, chS, filterSChan, server,
ralS := NewRalService(cfg, chS, server,
make(chan rpcclient.ClientConnector, 1), make(chan rpcclient.ClientConnector, 1),
make(chan rpcclient.ClientConnector, 1), make(chan rpcclient.ClientConnector, 1),
schS, engineShutdown, nil)
engineShutdown, nil)
cdrS := NewCDRServer(cfg, db, stordb, filterSChan, server,
make(chan rpcclient.ClientConnector, 1),
nil)