Tests fixup using the new functions in libtests

This commit is contained in:
DanB
2014-12-05 18:55:25 +01:00
parent 91ff8f5147
commit 328bb416b2
3 changed files with 7 additions and 45 deletions

View File

@@ -114,19 +114,8 @@ func TestInitDataDb(t *testing.T) {
if !*testLocal {
return
}
ratingDb, err := engine.ConfigureRatingStorage(cfg.RatingDBType, cfg.RatingDBHost, cfg.RatingDBPort, cfg.RatingDBName, cfg.RatingDBUser, cfg.RatingDBPass, cfg.DBDataEncoding)
if err != nil {
t.Fatal("Cannot connect to dataDb", err)
}
accountDb, err := engine.ConfigureAccountingStorage(cfg.AccountDBType, cfg.AccountDBHost, cfg.AccountDBPort, cfg.AccountDBName,
cfg.AccountDBUser, cfg.AccountDBPass, cfg.DBDataEncoding)
if err != nil {
t.Fatal("Cannot connect to dataDb", err)
}
for _, db := range []engine.Storage{ratingDb, accountDb} {
if err := db.Flush(); err != nil {
t.Fatal("Cannot reset dataDb", err)
}
if err := engine.InitDataDb(cfg); err != nil {
t.Fatal(err)
}
}

View File

@@ -46,20 +46,8 @@ func TestCDRStatsLclInitDataDb(t *testing.T) {
if !*testLocal {
return
}
ratingDb, err := engine.ConfigureRatingStorage(cdrstCfg.RatingDBType, cdrstCfg.RatingDBHost, cdrstCfg.RatingDBPort, cdrstCfg.RatingDBName,
cdrstCfg.RatingDBUser, cdrstCfg.RatingDBPass, cdrstCfg.DBDataEncoding)
if err != nil {
t.Fatal("Cannot connect to dataDb", err)
}
accountDb, err := engine.ConfigureAccountingStorage(cdrstCfg.AccountDBType, cdrstCfg.AccountDBHost, cdrstCfg.AccountDBPort, cdrstCfg.AccountDBName,
cdrstCfg.AccountDBUser, cdrstCfg.AccountDBPass, cdrstCfg.DBDataEncoding)
if err != nil {
t.Fatal("Cannot connect to dataDb", err)
}
for _, db := range []engine.Storage{ratingDb, accountDb} {
if err := db.Flush(); err != nil {
t.Fatal("Cannot reset dataDb", err)
}
if err := engine.InitDataDb(cdrstCfg); err != nil {
t.Fatal(err)
}
}

View File

@@ -54,11 +54,8 @@ func TestTutLclResetDb(t *testing.T) {
if !*testLocal {
return
}
if db, err := engine.NewMySQLStorage(tutCfg.StorDBHost, tutCfg.StorDBPort, tutCfg.StorDBName, tutCfg.StorDBUser, tutCfg.StorDBPass,
tutCfg.StorDBMaxOpenConns, tutCfg.StorDBMaxIdleConns); err != nil {
t.Error(err)
} else if errFlush := db.Flush(); errFlush != nil {
t.Error(err)
if err := engine.InitCdrDb(tutCfg); err != nil {
t.Fatal(err)
}
}
@@ -66,21 +63,9 @@ func TestTutLclResetDataDb(t *testing.T) {
if !*testLocal {
return
}
ratingDb, err := engine.ConfigureRatingStorage(tutCfg.RatingDBType, tutCfg.RatingDBHost, tutCfg.RatingDBPort, tutCfg.RatingDBName,
tutCfg.RatingDBUser, tutCfg.RatingDBPass, tutCfg.DBDataEncoding)
if err != nil {
if err := engine.InitDataDb(tutCfg); err != nil {
t.Fatal(err)
}
accountDb, err := engine.ConfigureAccountingStorage(tutCfg.AccountDBType, tutCfg.AccountDBHost, tutCfg.AccountDBPort, tutCfg.AccountDBName,
tutCfg.AccountDBUser, tutCfg.AccountDBPass, tutCfg.DBDataEncoding)
if err != nil {
t.Fatal(err)
}
for _, db := range []engine.Storage{ratingDb, accountDb} {
if err := db.Flush(); err != nil {
t.Fatal(err)
}
}
}
func TestTutLclStartEngine(t *testing.T) {