Engine tests fixes

This commit is contained in:
DanB
2017-11-03 13:48:00 +01:00
parent 6042f45d5e
commit 143e8b3db8
2 changed files with 1 additions and 7 deletions

View File

@@ -107,6 +107,7 @@ func (vers Versions) Compare(curent Versions, storType string) string {
return ""
}
<<<<<<< HEAD
func CurrentDataDBVersions() Versions {
return Versions{
utils.StatS: 2,

View File

@@ -182,16 +182,9 @@ func testVersion(t *testing.T) {
storType = storageDb.GetStorageType()
switch storType {
case utils.MONGO, utils.MAPSTOR:
<<<<<<< HEAD
currentVersion = Versions{utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2,
utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2, utils.CDRs: 2}
testVersion = Versions{utils.Accounts: 1, utils.Actions: 2, utils.ActionTriggers: 2,
utils.ActionPlans: 2, utils.SharedGroups: 2, utils.COST_DETAILS: 2, utils.CDRs: 2}
=======
currentVersion = allVersions
testVersion = allVersions
testVersion[utils.Accounts] = 1
>>>>>>> Added move feature(to migrate data from one db to another) and updated GetTPIds , IsDBempty and the versioning accordingly
test = "Migration needed: please backup cgr data and run : <cgr-migrator -migrate=*accounts>"
case utils.POSTGRES, utils.MYSQL:
currentVersion = storDbVersions