Merge branch 'dev' into hohoTT-dev

Conflicts:
	contest_submission/tests.py
This commit is contained in:
hohoTT committed 2015-08-28 15:26:10 +08:00
commit 2fbdf265c8
25 files changed
+648 -421

No files matched your search

+1 -1
View File
@@ -41,7 +41,7 @@ class SubmissionsListPageTest(TestCase):
def test_submissionsListPage_page_not_exist(self):
self.client.login(username="gogoing", password="666666")
response = self.client.get('/submissions/5/')
response = self.client.get('/submissions/999/')
self.assertTemplateUsed(response, "utils/error.html")
def test_submissionsListPage_have_no_submission(self):