From 5765e92c50ba98fbd6967056f8132759ce90cf03 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Sat, 2 Mar 2013 21:06:08 +0100 Subject: [PATCH] fix tests --- mygpo/admin/tests.py | 12 ++++++++---- mygpo/api/tests.py | 4 +++- mygpo/maintenance/tests.py | 21 +++++++++++++++------ 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/mygpo/admin/tests.py b/mygpo/admin/tests.py index 82d01843..1bb0b916 100644 --- a/mygpo/admin/tests.py +++ b/mygpo/admin/tests.py @@ -6,6 +6,7 @@ Replace this with more appropriate tests for your application. """ import time +from datetime import datetime from django.test import TestCase @@ -17,6 +18,7 @@ from mygpo.db.couchdb.episode import episode_by_id, episodes_for_podcast from mygpo.db.couchdb.podcast import podcast_by_id from mygpo.db.couchdb.podcast_state import podcast_state_for_user_podcast from mygpo.db.couchdb.episode_state import episode_state_for_user_episode +from mygpo.utils import get_timestamp class SimpleTest(TestCase): @@ -57,8 +59,8 @@ class SimpleTest(TestCase): e4.save() user = User() - user.username = 'user' - user.email = 'user@example.com' + user.username = 'user-test_merge' + user.email = 'user-test_merge@example.com' user.set_password('secret') device1 = Device() @@ -80,11 +82,13 @@ class SimpleTest(TestCase): p2.subscribe(user, device2) s1 = episode_state_for_user_episode(user, e1) - s1.add_actions([EpisodeAction(action='play')]) + s1.add_actions([EpisodeAction(action='play', + upload_timestamp=get_timestamp(datetime.utcnow()))]) s1.save() s3 = episode_state_for_user_episode(user, e3) - s3.add_actions([EpisodeAction(action='play')]) + s3.add_actions([EpisodeAction(action='play', + upload_timestamp=get_timestamp(datetime.utcnow()))]) s3.save() # we need that for later diff --git a/mygpo/api/tests.py b/mygpo/api/tests.py index de5146e4..8b105b3c 100644 --- a/mygpo/api/tests.py +++ b/mygpo/api/tests.py @@ -86,6 +86,7 @@ class AdvancedAPITests(unittest.TestCase): extra['since'] = 0 response = self.client.get(url, **extra) + self.assertEqual(response.status_code, 200, response.content) response_obj = json.loads(response.content) actions = response_obj['actions'] self.assertTrue(self.compare_action_list(self.action_data, actions)) @@ -99,6 +100,7 @@ class AdvancedAPITests(unittest.TestCase): found = True if not found: + raise ValueError('%s not found in %s' % (a1, as2)) return False return True @@ -106,7 +108,7 @@ class AdvancedAPITests(unittest.TestCase): def compare_actions(self, a1, a2): for key, val in a1.items(): - if a2[key] != val: + if a2.get(key, None) != val: return False return True diff --git a/mygpo/maintenance/tests.py b/mygpo/maintenance/tests.py index 2377a240..b4affab2 100644 --- a/mygpo/maintenance/tests.py +++ b/mygpo/maintenance/tests.py @@ -24,6 +24,7 @@ from mygpo.core.models import Podcast, Episode from mygpo.users.models import EpisodeAction, User from mygpo.maintenance.merge import PodcastMerger from mygpo.counter import Counter +from mygpo.utils import get_timestamp from mygpo.db.couchdb.podcast import podcast_by_id from mygpo.db.couchdb.episode import episode_by_id from mygpo.db.couchdb.episode_state import episode_state_for_user_episode @@ -46,7 +47,7 @@ class MergeTests(TestCase): self.episode1.save() self.episode2.save() - self.user = User(username='test') + self.user = User(username='test-merge') self.user.email = 'test@example.com' self.user.set_password('secret!') self.user.save() @@ -58,8 +59,12 @@ class MergeTests(TestCase): state1 = episode_state_for_user_episode(self.user, self.episode1) state2 = episode_state_for_user_episode(self.user, self.episode2) - action1 = EpisodeAction(action='play', timestamp=datetime.utcnow()) - action2 = EpisodeAction(action='download', timestamp=datetime.utcnow()) + action1 = EpisodeAction(action='play', + timestamp=datetime.utcnow(), + upload_timestamp=get_timestamp(datetime.utcnow())) + action2 = EpisodeAction(action='download', + timestamp=datetime.utcnow(), + upload_timestamp=get_timestamp(datetime.utcnow())) state1.add_actions([action1]) state2.add_actions([action2]) @@ -122,7 +127,7 @@ class MergeGroupTests(TestCase): self.podcast2.group_with(self.podcast3, 'My Group', 'Feed1', 'Feed2') - self.user = User(username='test') + self.user = User(username='test-merge-group') self.user.email = 'test@example.com' self.user.set_password('secret!') self.user.save() @@ -143,8 +148,12 @@ class MergeGroupTests(TestCase): state1 = episode_state_for_user_episode(self.user, self.episode1) state2 = episode_state_for_user_episode(self.user, self.episode2) - action1 = EpisodeAction(action='play', timestamp=datetime.utcnow()) - action2 = EpisodeAction(action='download', timestamp=datetime.utcnow()) + action1 = EpisodeAction(action='play', + timestamp=datetime.utcnow(), + upload_timestamp=get_timestamp(datetime.utcnow())) + action2 = EpisodeAction(action='download', + timestamp=datetime.utcnow(), + upload_timestamp=get_timestamp(datetime.utcnow())) state1.add_actions([action1]) state2.add_actions([action2]) -- 2.11.4.GIT