From c09c3d0c6ba43252c567dbeeee4405777b3be65e Mon Sep 17 00:00:00 2001
From: zming <517046497@qq.com>
Date: Fri, 13 Oct 2017 11:55:47 +0800
Subject: [PATCH] fixed test

---
 seahub/views/sysadmin.py                      |   2 +-
 .../seahub/views/sysadmin/batch_add_user.csv  |   1 -
 .../seahub/views/sysadmin/batch_add_user.xlsx | Bin 5777 -> 0 bytes
 tests/seahub/views/sysadmin/test_sysadmin.py  | 150 ++----------------
 4 files changed, 16 insertions(+), 137 deletions(-)
 delete mode 100644 tests/seahub/views/sysadmin/batch_add_user.csv
 delete mode 100644 tests/seahub/views/sysadmin/batch_add_user.xlsx

diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index 344d1c3536..c939f64861 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -1965,7 +1965,7 @@ def batch_add_user(request):
         rows = wb.worksheets[0].rows
         records = []
         # remove first row(head field).
-        next(rows)
+        rows.next()
         for row in rows:
             records.append([c.value for c in row])
 
diff --git a/tests/seahub/views/sysadmin/batch_add_user.csv b/tests/seahub/views/sysadmin/batch_add_user.csv
deleted file mode 100644
index aeb73bd9cc..0000000000
--- a/tests/seahub/views/sysadmin/batch_add_user.csv
+++ /dev/null
@@ -1 +0,0 @@
-aaaaaa@test.com,123,nickname,department,default,1000
diff --git a/tests/seahub/views/sysadmin/batch_add_user.xlsx b/tests/seahub/views/sysadmin/batch_add_user.xlsx
deleted file mode 100644
index 7de8cf0a7e1478e405692341604c603eb23d1b10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5777
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
Z{M1y%K<Y98050+hKuTd(zvLOf{{U7a2tEJ+

diff --git a/tests/seahub/views/sysadmin/test_sysadmin.py b/tests/seahub/views/sysadmin/test_sysadmin.py
index 4f4ee168e1..6d8c12c403 100644
--- a/tests/seahub/views/sysadmin/test_sysadmin.py
+++ b/tests/seahub/views/sysadmin/test_sysadmin.py
@@ -161,127 +161,8 @@ class SysUserAdminExportExcelTest(BaseTestCase):
         self.assertEqual(200, resp.status_code)
         assert 'application/ms-excel' in resp._headers['content-type']
 
+
 class BatchAddUserTest(BaseTestCase):
-    def setUp(self):
-        self.clear_cache()
-        self.login_as(self.admin)
-
-        self.new_users = []
-        self.csv_file = os.path.join(os.getcwd(), 'tests/seahub/views/sysadmin/batch_add_user.csv')
-        with open(self.csv_file) as f:
-            for line in f.readlines():
-                self.new_users.append(line.split(',')[0].strip())
-
-    def tearDown(self):
-        for u in self.new_users:
-            self.remove_user(u)
-
-    def test_can_batch_add(self):
-        for e in self.new_users:
-            try:
-                r = User.objects.get(e)
-            except User.DoesNotExist:
-                r = None
-            assert r is None
-
-        with open(self.csv_file) as f:
-            resp = self.client.post(reverse('batch_add_user'), {
-                'file': f
-            })
-
-        self.assertEqual(302, resp.status_code)
-        assert 'Import succeeded' in resp.cookies['messages'].value
-        for e in self.new_users:
-            assert User.objects.get(e) is not None
-
-    def test_can_batch_add_when_pwd_change_required(self):
-        config.FORCE_PASSWORD_CHANGE = 1
-
-        for e in self.new_users:
-            assert len(UserOptions.objects.filter(
-                email=e, option_key=KEY_FORCE_PASSWD_CHANGE)) == 0
-
-        for e in self.new_users:
-            try:
-                r = User.objects.get(e)
-            except User.DoesNotExist:
-                r = None
-            assert r is None
-
-        with open(self.csv_file) as f:
-            resp = self.client.post(reverse('batch_add_user'), {
-                'file': f
-            })
-
-        self.assertEqual(302, resp.status_code)
-        assert 'Import succeeded' in resp.cookies['messages'].value
-        for e in self.new_users:
-            assert User.objects.get(e) is not None
-            assert UserOptions.objects.passwd_change_required(e)
-
-    def test_can_batch_add_when_pwd_change_not_required(self):
-        config.FORCE_PASSWORD_CHANGE = 0
-
-        for e in self.new_users:
-            assert len(UserOptions.objects.filter(
-                email=e, option_key=KEY_FORCE_PASSWD_CHANGE)) == 0
-
-        for e in self.new_users:
-            try:
-                r = User.objects.get(e)
-            except User.DoesNotExist:
-                r = None
-            assert r is None
-
-        with open(self.csv_file) as f:
-            resp = self.client.post(reverse('batch_add_user'), {
-                'file': f
-            })
-
-        self.assertEqual(302, resp.status_code)
-        assert 'Import succeeded' in resp.cookies['messages'].value
-        for e in self.new_users:
-            assert User.objects.get(e) is not None
-            assert not UserOptions.objects.passwd_change_required(e)
-
-    @patch('seahub.views.sysadmin.user_number_over_limit')
-    def test_can_not_batch_add_if_user_over_limit(self, mock_user_number_over_limit):
-
-        mock_user_number_over_limit.return_value = True
-
-        for e in self.new_users:
-            try:
-                r = User.objects.get(e)
-            except User.DoesNotExist:
-                r = None
-            assert r is None
-
-        with open(self.csv_file) as f:
-            resp = self.client.post(reverse('batch_add_user'), {
-                'file': f
-            })
-
-        self.assertEqual(302, resp.status_code)
-        assert 'users exceeds the limit' in resp.cookies['messages'].value
-
-    def test_can_send_email(self):
-        self.assertEqual(0, len(Email.objects.all()))
-
-        with open(self.csv_file) as f:
-            resp = self.client.post(reverse('batch_add_user'), {
-                'file': f
-            })
-
-        self.assertEqual(302, resp.status_code)
-        self.assertNotEqual(0, len(Email.objects.all()))
-
-        email = Email.objects.all()[0]
-        assert self.new_users[0] == email.to[0]
-        assert "Email: %s" % self.new_users[0] in email.html_message
-        assert email.status == 2
-
-
-class BatchAddUserUsingExcelTest(BaseTestCase):
     def setUp(self):
         self.clear_cache()
         self.login_as(self.admin)
@@ -289,6 +170,7 @@ class BatchAddUserUsingExcelTest(BaseTestCase):
         self.new_users = []
         self.excel_file = os.path.join(os.getcwd(), 'tests/seahub/views/sysadmin/batch_add_user.xlsx')
         data_list = []
+        data_list.append(['email', 'password', 'username', 'department', 'role', 'quota'])
         for i in xrange(20):
             username = "username@test" + str(i) +".com"
             password = "password"
@@ -317,7 +199,7 @@ class BatchAddUserUsingExcelTest(BaseTestCase):
             assert r is None
 
         with open(self.excel_file) as f:
-            resp = self.client.post(reverse('batch_add_user_using_excel'), {
+            resp = self.client.post(reverse('batch_add_user'), {
                 'file': f
             })
 
@@ -341,7 +223,7 @@ class BatchAddUserUsingExcelTest(BaseTestCase):
             assert r is None
 
         with open(self.excel_file) as f:
-            resp = self.client.post(reverse('batch_add_user_using_excel'), {
+            resp = self.client.post(reverse('batch_add_user'), {
                 'file': f
             })
 
@@ -366,7 +248,7 @@ class BatchAddUserUsingExcelTest(BaseTestCase):
             assert r is None
 
         with open(self.excel_file) as f:
-            resp = self.client.post(reverse('batch_add_user_using_excel'), {
+            resp = self.client.post(reverse('batch_add_user'), {
                 'file': f
             })
 
@@ -389,7 +271,7 @@ class BatchAddUserUsingExcelTest(BaseTestCase):
             assert r is None
 
         with open(self.excel_file) as f:
-            resp = self.client.post(reverse('batch_add_user_using_excel'), {
+            resp = self.client.post(reverse('batch_add_user'), {
                 'file': f
             })
 
@@ -400,7 +282,7 @@ class BatchAddUserUsingExcelTest(BaseTestCase):
         self.assertEqual(0, len(Email.objects.all()))
 
         with open(self.excel_file) as f:
-            resp = self.client.post(reverse('batch_add_user_using_excel'), {
+            resp = self.client.post(reverse('batch_add_user'), {
                 'file': f
             })
 
@@ -413,7 +295,7 @@ class BatchAddUserUsingExcelTest(BaseTestCase):
         assert email.status == 2
 
 
-class BatchAddUserUsingExcelHelpTest(BaseTestCase):
+class BatchAddUserHelpTest(BaseTestCase):
     def setUp(self):
         self.login_as(self.admin)
 
@@ -427,14 +309,12 @@ class BatchAddUserUsingExcelHelpTest(BaseTestCase):
         assert wb.sheetnames[0] == 'sample'
         rows = wb.worksheets[0].rows
         i = 0
+        rows.next()
         for r in rows:
-            assert r[0].value == 'username@test' + str(i) + '.com'
-            assert r[1].value == 'password'
-            assert r[2].value == 'name_test' + str(i)
-            assert r[3].value == 'department_test' + str(i)
-            if i < 10:
-                assert r[4].value == 'guest'
-            else:
-                assert r[4].value == 'default'
-            assert r[5].value == '999'
+            assert r[0].value == 'test' + str(i) + '@example.com'
+            assert r[1].value == '123456'
+            assert r[2].value == 'test' + str(i)
+            assert r[3].value == 'department' + str(i)
+            assert r[4].value == 'default'
+            assert r[5].value == '1000'
             i += 1