Merge branch 'master' into pointer

This commit is contained in:
Radu Ioan Fericean
2016-02-16 22:48:04 +02:00
6 changed files with 53 additions and 10 deletions

View File

@@ -495,5 +495,5 @@ func LoadUserProfile(in interface{}, extraFields string) error {
utils.SetMapExtraFields(in, m, extraFields)
return nil
}
return utils.ErrNotFound
return utils.ErrUserNotFound
}

View File

@@ -708,7 +708,7 @@ func TestUsersExternalCDRGetLoadUserProfileExtraFieldsNotFound(t *testing.T) {
}
err := LoadUserProfile(ur, "ExtraFields")
if err != utils.ErrNotFound {
if err != utils.ErrUserNotFound {
t.Error("Error detecting err in loading user profile: ", err)
}
}