Merge branch 'dev' into hohoTT-dev

Conflicts:
	oj/settings.py
	oj/urls.py
	problem/views.py

account/tests.py

@@ -149,15 +149,21 @@ class UserAPITest(APITestCase):
     def setUp(self):
         self.client = APIClient()
         self.url = reverse("user_list_api")
+        user = User.objects.create(username="testx", real_name="xx", admin_type=SUPER_ADMIN)
+        user.set_password("testxx")
+        user.save()
 
     def test_success_get_data(self):
+        self.client.login(username="testx", password="testxx")
         self.assertEqual(self.client.get(self.url).data["code"], 0)
 
     def test_error_admin_type(self):
+        self.client.login(username="testx", password="testxx")
         response = self.client.get(self.url + "?admin_type=error")
         self.assertEqual(response.data, {"code": 1, "data": u"参数错误"})
 
     def test_query_by_keyword(self):
+        self.client.login(username="testx", password="testxx")
         user1 = User.objects.create(username="test1", real_name="aa")
         user1.set_password("testaa")
         user1.save()