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/contest/tests.py
+++ b/contest/tests.py
@@ -373,7 +373,7 @@ class ContestProblemAdminAPItEST(APITestCase):

    def test_query_contest_problem_exists_by_contest_id(self):
        self.client.login(username="test3", password="testaa")
-        response = self.client.get(self.url + "?contest_id=1")
+        response = self.client.get(self.url + "?contest_id="+ str(self.global_contest.id))
        self.assertEqual(response.data["code"], 0)
        self.assertEqual(len(response.data["data"]), 0)