summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2011-08-18 17:36:04 +0200
committerOlivier Dony <odo@openerp.com>2011-08-18 17:36:04 +0200
commit2357eb562e96c563793cfd4b1c34f9bfe87520dc (patch)
tree941eae4e2a206f9a29a3133a77f2bf7cfe2ae767
parentac9c0e55b0ce6e5d1b2d4ffd066910692d3cfb12 (diff)
[FIX] document_ftp: avoid calling res.users.read() with too few arguments (it's broken, pending fix)
bzr revid: odo@openerp.com-20110818153604-gefze43wp1u63j02
-rw-r--r--addons/document_ftp/test_easyftp.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index ac2cd722478..74890b1a333 100644
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -36,13 +36,13 @@ def get_plain_ftp(timeout=10.0):
def get_ftp_login(cr, uid, ormobj):
ftp = get_plain_ftp()
- user = ormobj.pool.get('res.users').read(cr, uid, uid)
- passwd = user.get('password','')
+ user = ormobj.pool.get('res.users').browse(cr, uid, uid)
+ passwd = user.password or ''
if passwd.startswith("$1$"):
- # md5 by base crypt. We cannot decode, wild guess
+ # md5 by base crypt. We cannot decode, wild guess
# that passwd = login
- passwd = user.get('login', '')
- ftp.login(user.get('login',''), passwd)
+ passwd = user.login
+ ftp.login(user.login, passwd)
ftp.cwd("/" + cr.dbname)
return ftp