2 commits - configure.ac pykolab/wap_client tests/functional
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Wed May 14 14:06:14 CEST 2014
configure.ac | 1 -
pykolab/wap_client/__init__.py | 14 ++++++++++----
tests/functional/test_kolabd/test_001_user_sync.py | 7 +++++--
3 files changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 4583e353fcb16fb5de8f2e83d11173d1f784b80a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Wed May 14 14:05:56 2014 +0200
Use 'id' rather than 'user' parameter
diff --git a/pykolab/wap_client/__init__.py b/pykolab/wap_client/__init__.py
index 54ef541..b7ac1e9 100644
--- a/pykolab/wap_client/__init__.py
+++ b/pykolab/wap_client/__init__.py
@@ -312,6 +312,8 @@ def request_raw(method, api_uri, get=None, post=None, headers={}):
if conf.debuglevel > 8:
conn.set_debuglevel(9)
+ conn.set_debuglevel(9)
+
if not get == None:
_get = "?%s" % (urllib.urlencode(get))
else:
@@ -326,6 +328,7 @@ def request_raw(method, api_uri, get=None, post=None, headers={}):
data = response.read()
log.debug(_("Got response: %r") % (data), level=8)
+
try:
response_data = json.loads(data)
except ValueError, e:
@@ -362,7 +365,7 @@ def user_add(params=None):
def user_delete(params=None):
if params == None:
params = {
- 'user': utils.ask_question("Username for user to delete", "user")
+ 'id': utils.ask_question("Username for user to delete", "user")
}
post = json.dumps(params)
@@ -372,11 +375,11 @@ def user_delete(params=None):
def user_edit(user = None, attributes={}):
if user == None:
get = {
- 'user': utils.ask_question("Username for user to edit", "user")
+ 'id': utils.ask_question("Username for user to edit", "user")
}
else:
get = {
- 'user': user
+ 'id': user
}
user_info = request('GET', 'user.info', get=get)
@@ -514,8 +517,11 @@ def user_form_value_generate_userpassword(*args, **kw):
def user_info(user=None):
if user == None:
user = utils.ask_question("User email address")
- _params = { 'user': user }
+
+ _params = { 'id': user }
+
user = request('GET', 'user.info', get=_params)
+
return user
def user_types_list():
diff --git a/tests/functional/test_kolabd/test_001_user_sync.py b/tests/functional/test_kolabd/test_001_user_sync.py
index aef47aa..671188a 100644
--- a/tests/functional/test_kolabd/test_001_user_sync.py
+++ b/tests/functional/test_kolabd/test_001_user_sync.py
@@ -37,6 +37,7 @@ class TestKolabDaemon(unittest.TestCase):
self.assertEqual(recipient, "uid=doe,ou=People,dc=example,dc=org")
result = wap_client.user_info(recipient)
+
self.assertEqual(result['mail'], 'john.doe at example.org')
self.assertEqual(result['alias'], ['doe at example.org', 'j.doe at example.org'])
@@ -82,7 +83,8 @@ class TestKolabDaemon(unittest.TestCase):
imap = IMAP()
imap.connect()
- exec("ac_folders = %s" % (conf.get_raw(conf.get('kolab', 'primary_domain'), 'autocreate_folders')))
+ ac_folders = conf.get_raw('kolab', 'autocreate_folders')
+ exec("ac_folders = %s" % (ac_folders))
folders = imap.lm('user/%(local)s/*@%(domain)s' % (self.user))
@@ -92,7 +94,8 @@ class TestKolabDaemon(unittest.TestCase):
imap = IMAP()
imap.connect()
- exec("ac_folders = %s" % (conf.get_raw(conf.get('kolab', 'primary_domain'), 'autocreate_folders')))
+ ac_folders = conf.get_raw('kolab', 'autocreate_folders')
+ exec("ac_folders = %s" % (ac_folders))
folders = []
folders.extend(imap.lm('user/%(local)s@%(domain)s' % (self.user)))
commit 58674fa2c72a8a6f230d787db9444d279f951ba5
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Wed May 14 09:50:33 2014 +0200
Remove kolab/Makefile
diff --git a/configure.ac b/configure.ac
index c1a3399..3c521fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ bin/rebuild.sh
Makefile
pykolab.spec
conf/Makefile
-kolab/Makefile
kolabd/Makefile
po/Makefile.in
pykolab/constants.py
More information about the commits
mailing list