Merge branch 'dev' into hohoTT-dev

Conflicts:
	contest/views.py

problem/tests.py

@@ -144,7 +144,7 @@ class ProblemAdminTest(APITestCase):
         self.assertEqual(response.data, {"code": 1, "data": u"题目不存在"})
 
     def test_query_problem_exists(self):
-        data = {"problem_id": 1}
+        data = {"problem_id": self.problem.id}
         response = self.client.get(self.url, data=data)
         self.assertEqual(response.data["code"], 0)
 

problem/views.py

@@ -185,8 +185,12 @@ class TestCaseUploadAPIView(APIView):
             os.mkdir(test_case_dir)
             for name in l:
                 f = open(test_case_dir + name, "wb")
-                f.write(test_case_file.read(name).replace("\r\n", "\n"))
-                f.close()
+                try:
+                    f.write(test_case_file.read(name).replace("\r\n", "\n"))
+                except MemoryError:
+                    return error_response(u"单个测试数据体积过大!")
+                finally:
+                    f.close()
             l.sort()
 
             file_info = {"test_case_number": len(l) / 2, "test_cases": {}}