Merge branch 'dev' into hohoTT-dev

Conflicts: contest/views.py
2015-09-07 20:01:59 +08:00
parent 9d01c9fbe9 162913746f
commit aab770b8bf
18 changed files with 262 additions and 43 deletions
--- a/problem/tests.py
+++ b/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)