Don't load any peer pref to real.

squeeze-backports
Victor Seva 13 years ago
parent 4acb0d5131
commit 83deca8eff

@ -34,7 +34,6 @@ NGCPRealPrefs_MT = { __index = NGCPRealPrefs }
function NGCPRealPrefs:_peer_load(level, keys) function NGCPRealPrefs:_peer_load(level, keys)
local _,v local _,v
local xavp = { local xavp = {
real = NGCPRealPrefs:xavp(level),
peer = NGCPPeerPrefs:xavp(level), peer = NGCPPeerPrefs:xavp(level),
} }
local real_keys = {} local real_keys = {}
@ -43,10 +42,6 @@ NGCPRealPrefs_MT = { __index = NGCPRealPrefs }
value = xavp.peer(v) value = xavp.peer(v)
if value then if value then
table.add(real_keys, v) table.add(real_keys, v)
--sr.log("info", string.format("key:%s value:%s", v, value))
xavp.real(v, value)
else
sr.log("err", string.format("key:%s not in user or domain", v))
end end
end end
return real_keys return real_keys

@ -80,7 +80,8 @@ TestNGCPRealPrefs = {} --class
xavp.peer("uno",3) xavp.peer("uno",3)
local real_keys = self.real:caller_peer_load(keys) local real_keys = self.real:caller_peer_load(keys)
assertEquals(real_keys, keys) assertEquals(real_keys, keys)
assertEquals(xavp.real("uno"),3) assertEquals(xavp.real("uno"),nil)
assertEquals(xavp.peer("uno"),3)
end end
function TestNGCPRealPrefs:test_caller_usr_load() function TestNGCPRealPrefs:test_caller_usr_load()

Loading…
Cancel
Save