From fb1ee8e784430f17666b95a38923c37a83df5bdc Mon Sep 17 00:00:00 2001
From: zhengxie <xiez1989@gmail.com>
Date: Sat, 27 Jun 2015 16:31:13 +0800
Subject: [PATCH] Fix user remove bug

---
 seahub/base/accounts.py             |  8 +++++-
 seahub/test_utils.py                |  4 +--
 tests/seahub/views/test_sysadmin.py | 40 +++++++++++++++++++++--------
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/seahub/base/accounts.py b/seahub/base/accounts.py
index 0996de4add..9382329be3 100644
--- a/seahub/base/accounts.py
+++ b/seahub/base/accounts.py
@@ -91,6 +91,7 @@ class UserManager(object):
         user.org = emailuser.org
         user.source = emailuser.source
         user.role = emailuser.role
+        user.source = emailuser.source
 
         return user
 
@@ -172,7 +173,12 @@ class User(object):
         When delete user, we should also delete group relationships.
         """
         # TODO: what about repos and groups?
-        ccnet_threaded_rpc.remove_emailuser(self.username)
+        if self.source == "DB":
+            source = "DB"
+        else:
+            source = "LDAP"
+
+        ccnet_threaded_rpc.remove_emailuser(source, self.username)
         Profile.objects.delete_profile_by_user(self.username)
 
     def get_and_delete_messages(self):
diff --git a/seahub/test_utils.py b/seahub/test_utils.py
index f1ac401509..828ae0e0e4 100644
--- a/seahub/test_utils.py
+++ b/seahub/test_utils.py
@@ -51,8 +51,8 @@ class Fixtures(Exam):
 
         return User.objects.create_user(password='secret', **kwargs)
 
-    def remove_user(self, email):
-        ccnet_threaded_rpc.remove_emailuser(email)
+    def remove_user(self, email, source="DB"):
+        ccnet_threaded_rpc.remove_emailuser(email, source)
 
     def create_repo(self, **kwargs):
         repo_id = seafile_api.create_repo('test-repo', '',
diff --git a/tests/seahub/views/test_sysadmin.py b/tests/seahub/views/test_sysadmin.py
index 5448696705..1caa4569fe 100644
--- a/tests/seahub/views/test_sysadmin.py
+++ b/tests/seahub/views/test_sysadmin.py
@@ -1,9 +1,11 @@
 from django.core.urlresolvers import reverse
+from django.http.cookie import parse_cookie
 from django.test import TestCase
 
 from seahub.base.accounts import User
 from seahub.test_utils import Fixtures
 
+from seaserv import ccnet_threaded_rpc
 
 class UserToggleStatusTest(TestCase, Fixtures):
     def test_can_activate(self):
@@ -52,7 +54,7 @@ class UserResetTest(TestCase, Fixtures):
 
         old_passwd = self.user.enc_password
         resp = self.client.get(
-            reverse('user_reset', args=[self.user.id])
+            reverse('user_reset', args=[self.user.email])
         )
         self.assertEqual(302, resp.status_code)
 
@@ -81,20 +83,38 @@ class BatchUserMakeAdminTest(TestCase, Fixtures):
         assert u.enc_password == old_passwd
 
 
-class UserMakeAdminTest(TestCase, Fixtures):
-    def test_can_make_admin(self):
+# class UserMakeAdminTest(TestCase, Fixtures):
+#     def test_can_make_admin(self):
+#         self.client.post(
+#             reverse('auth_login'), {'username': self.admin.username,
+#                                     'password': 'secret'}
+#         )
+
+#         resp = self.client.get(
+#             reverse('user_make_admin', args=[self.user.id])
+#         )
+
+#         old_passwd = self.user.enc_password
+#         self.assertEqual(302, resp.status_code)
+
+#         u = User.objects.get(email=self.user.username)
+#         assert u.is_staff is True
+#         assert u.enc_password == old_passwd
+
+
+class UserRemoveTest(TestCase, Fixtures):
+    def test_can_remove(self):
         self.client.post(
             reverse('auth_login'), {'username': self.admin.username,
                                     'password': 'secret'}
         )
 
+        # create one user
+        username = self.user.username
+
         resp = self.client.get(
-            reverse('user_make_admin', args=[self.user.id])
+            reverse('user_remove', args=[username])
         )
 
-        old_passwd = self.user.enc_password
-        self.assertEqual(302, resp.status_code)
-
-        u = User.objects.get(email=self.user.username)
-        assert u.is_staff is True
-        assert u.enc_password == old_passwd
+        assert 'Successfully deleted %s' % username in parse_cookie(resp.cookies)['messages']
+        assert len(ccnet_threaded_rpc.search_emailusers('DB', username, -1, -1))  == 0