xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flake8

Browse Source
This commit is contained in:
virusdefender
2017-01-23 16:25:14 +08:00
parent 5c5cf7ff98
commit 32c1b89080
35 changed files with 56 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
conf/serializers.py
View File

@@ -13,17 +13,17 @@ class EditSMTPConfigSerializer(serializers.Serializer):
class CreateSMTPConfigSerializer(EditSMTPConfigSerializer):
password = serializers.CharField(max_length=128)
class SMTPConfigSerializer(serializers.ModelSerializer):
class Meta:
model = SMTPConfig
exclude = ["id", "password"]
class TestSMTPConfigSerializer(serializers.Serializer):
email = serializers.EmailField()
class CreateEditWebsiteConfigSerializer(serializers.Serializer):
base_url = serializers.CharField(max_length=128)
@@ -56,4 +56,3 @@ class JudgeServerHeartbeatSerializer(serializers.Serializer):
cpu = serializers.FloatField(min_value=0, max_value=100)
action = serializers.ChoiceField(choices=("heartbeat", ))
service_url = serializers.CharField(max_length=128, required=False)

6
conf/tests.py
View File

@@ -51,7 +51,7 @@ class SMTPConfigTest(APITestCase):
class WebsiteConfigAPITest(APITestCase):
def test_create_website_config(self):
user = self.create_super_admin()
self.create_super_admin()
url = self.reverse("website_config_api")
data = {"base_url": "http://test.com", "name": "test name",
"name_shortcut": "test oj", "footer": "<a>test</a>",
@@ -60,7 +60,7 @@ class WebsiteConfigAPITest(APITestCase):
self.assertSuccess(resp)
def test_edit_website_config(self):
user = self.create_super_admin()
self.create_super_admin()
url = self.reverse("website_config_api")
data = {"base_url": "http://test.com", "name": "test name",
"name_shortcut": "test oj", "footer": "<a>test</a>",
@@ -103,7 +103,7 @@ class JudgeServerHeartbeatest(APITestCase):
self.assertSuccess(resp)
server = JudgeServer.objects.first()
self.assertEqual(server.ip, "127.0.0.1")
self.assertEqual(server.service_url ,None)
self.assertEqual(server.service_url, None)
def test_new_heartbeat_service_url(self):
service_url = "http://1.2.3.4:8000/api/judge"

6
conf/urls/admin.py
View File

@@ -3,7 +3,7 @@ from django.conf.urls import url
from ..views import WebsiteConfigAPI, SMTPAPI, JudgeServerAPI
urlpatterns = [
url(r'^smtp$', SMTPAPI.as_view(), name="smtp_admin_api"),
url(r'^website$', WebsiteConfigAPI.as_view(), name="website_config_api"),
url(r'^judge_server', JudgeServerAPI.as_view(), name="judge_server_api")
url(r"^smtp$", SMTPAPI.as_view(), name="smtp_admin_api"),
url(r"^website$", WebsiteConfigAPI.as_view(), name="website_config_api"),
url(r"^judge_server", JudgeServerAPI.as_view(), name="judge_server_api")
]

4
conf/urls/oj.py
View File

@@ -4,6 +4,6 @@ from ..views import WebsiteConfigAPI, JudgeServerHeartbeatAPI
urlpatterns = [
url(r'^website$', WebsiteConfigAPI.as_view(), name="website_info_api"),
url(r'^judge_server_heartbeat$', JudgeServerHeartbeatAPI.as_view(), name="judge_server_heartbeat_api")
url(r"^website$", WebsiteConfigAPI.as_view(), name="website_info_api"),
url(r"^judge_server_heartbeat$", JudgeServerHeartbeatAPI.as_view(), name="judge_server_heartbeat_api")
]

8
conf/views.py
View File

@@ -49,8 +49,6 @@ class SMTPTestAPI(APIView):
@super_admin_required
@validate_serializer(TestSMTPConfigSerializer)
def post(self, request):
email = request.data["email"]
# todo: test send email
return self.success({"result": True})
@@ -111,7 +109,7 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView):
server.cpu_core = data["cpu_core"]
server.memory_usage = data["memory"]
server.cpu_usage = data["cpu"]
server.service_url= service_url
server.service_url = service_url
server.ip = ip
server.last_heartbeat = timezone.now()
server.save()
@@ -126,7 +124,3 @@ class JudgeServerHeartbeatAPI(CSRFExemptAPIView):
last_heartbeat=timezone.now(),
)
return self.success()