From 174752b9b1e0145148f9b039ffc615ff7229f41d Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Fri, 14 Aug 2015 10:36:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=90=8C=E5=90=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- account/tests.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/account/tests.py b/account/tests.py index aa21bc7..c8279aa 100644 --- a/account/tests.py +++ b/account/tests.py @@ -179,37 +179,28 @@ class UserAdminAPITest(APITestCase): response = self.client.get(self.url + "?keyword=test1") self.assertEqual(response.data["code"], 0) - -class UserAdminAPITest(APITestCase): - def setUp(self): - self.client = APIClient() - self.url = reverse("user_admin_api") - user = User.objects.create(username="test", admin_type=SUPER_ADMIN) - user.set_password("testaa") - user.save() - def test_put_invalid_data(self): - self.client.login(username="test", password="testaa") + self.client.login(username="testx", password="testxx") data = {"username": "test", "password": "testaa", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 1) def test_user_does_not_exist(self): - self.client.login(username="test", password="testaa") + self.client.login(username="testx", password="testxx") data = {"id": 2, "username": "test0", "real_name": "test00", "password": "testaa","email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data, {"code": 1, "data": u"该用户不存在！"}) def test_success_user_edit_not_password(self): - self.client.login(username="test", password="testaa") + self.client.login(username="testx", password="testxx") data = {"id": 1, "username": "test0", "real_name": "test00", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) self.assertEqual(response.data["code"], 0) def test_success_user_edit_change_password(self): - self.client.login(username="test", password="testaa") + self.client.login(username="testx", password="testxx") data = {"id": 1, "username": "test0", "real_name": "test00", "password": "111111", "email": "60@qq.com", "admin_type": "2"} response = self.client.put(self.url, data=data) From 84b8d1e067f0981a3d0737a60af1e60d983ee011 Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Fri, 14 Aug 2015 10:36:34 +0800 Subject: [PATCH 2/3] fix typo --- oj/urls.py | 4 ++-- submission/views.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/oj/urls.py b/oj/urls.py index e2fd51c..b0ca69f 100644 --- a/oj/urls.py +++ b/oj/urls.py @@ -14,7 +14,7 @@ from group.views import (GroupAdminAPIView, GroupMemberAdminAPIView, from admin.views import AdminTemplateView from problem.views import TestCaseUploadAPIView, ProblemTagAdminAPIView, ProblemAdminAPIView -from submission.views import SubmissionnAPIView +from submission.views import SubmissionAPIView urlpatterns = [ url(r'^install/$', "install.views.install"), @@ -56,6 +56,6 @@ urlpatterns = [ url(r'^api/admin/join_group_request/$', JoinGroupRequestAdminAPIView.as_view(), name="join_group_request_admin_api"), - url(r'^api/submission/$', SubmissionnAPIView.as_view(), name="submission_api"), + url(r'^api/submission/$', SubmissionAPIView.as_view(), name="submission_api"), ] diff --git a/submission/views.py b/submission/views.py index 0a923e0..07fe70f 100644 --- a/submission/views.py +++ b/submission/views.py @@ -18,12 +18,12 @@ from .serializers import CreateSubmissionSerializer def _create_mondodb_connection(): - mongodb_setting = settings["mongodb_setting"] - connection = pymongo.MongoClient(host=mongodb_setting["HOST"], port=mongodb_setting["PORT"]) - return connection["oj"]["oj_submission"] + mongodb_setting = settings.MONGODB + connection = pymongo.MongoClient(host=mongodb_setting["HOST"], port=mongodb_setting["PORT"]) + return connection["oj"]["oj_submission"] -class SubmissionnAPIView(APIView): +class SubmissionAPIView(APIView): @login_required def post(self, request): """ From a0613e0a756621c58d46df26eeab33f65e1283fe Mon Sep 17 00:00:00 2001 From: virusdefender <1670873886@qq.com> Date: Fri, 14 Aug 2015 10:36:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=20mongodb=20=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oj/local_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oj/local_settings.py b/oj/local_settings.py index 7a7249c..2112566 100644 --- a/oj/local_settings.py +++ b/oj/local_settings.py @@ -16,7 +16,7 @@ DATABASES = { } } -mongodb_setting = { +MONGODB = { 'HOST': '127.0.0.1', 'USERNAME': 'root', 'PASSWORD': 'root',