diff --git a/apps/feed_import/tests.py b/apps/feed_import/test_feed_import.py similarity index 96% rename from apps/feed_import/tests.py rename to apps/feed_import/test_feed_import.py index 9593e66eb..9fb5c9ffb 100644 --- a/apps/feed_import/tests.py +++ b/apps/feed_import/test_feed_import.py @@ -6,7 +6,7 @@ from django.urls import reverse from apps.reader.models import UserSubscription, UserSubscriptionFolders from utils import json_functions as json -class ImportTest(TestCase): +class Test_Import(TestCase): fixtures = ['opml_import.json'] def setUp(self): @@ -47,3 +47,6 @@ class ImportTest(TestCase): subs = UserSubscription.objects.filter(user=user) self.assertEquals(subs.count(), 0) + +class Test_Duplicate_Feeds(TestCase): + pass \ No newline at end of file diff --git a/apps/profile/tests.py b/apps/profile/test_profile.py similarity index 97% rename from apps/profile/tests.py rename to apps/profile/test_profile.py index cfcf5610f..d35afcf3b 100644 --- a/apps/profile/tests.py +++ b/apps/profile/test_profile.py @@ -5,7 +5,7 @@ from django.urls import reverse from django.conf import settings from mongoengine.connection import connect, disconnect -class ProfileTest(TestCase): +class Test_Profile(TestCase): fixtures = [ 'subscriptions.json', 'rss_feeds.json', diff --git a/apps/push/tests.py b/apps/push/test_push.py similarity index 99% rename from apps/push/tests.py rename to apps/push/test_push.py index b40648dbc..8aac0d882 100644 --- a/apps/push/tests.py +++ b/apps/push/test_push.py @@ -71,7 +71,7 @@ class PSHBTestBase: self.requests.append((url, data)) return self.responses.pop() -class PSHBSubscriptionManagerTest(PSHBTestBase, TestCase): +class Test_PSHBSubscriptionManagerTest(PSHBTestBase, TestCase): def test_sync_verify(self): """ @@ -153,7 +153,7 @@ class PSHBSubscriptionManagerTest(PSHBTestBase, TestCase): else: self.fail('subscription did not raise URLError exception') -class PSHBCallbackViewTestCase(PSHBTestBase, TestCase): +class Test_PSHBCallbackViewCase(PSHBTestBase, TestCase): def test_verify(self): """ @@ -235,7 +235,7 @@ class PSHBCallbackViewTestCase(PSHBTestBase, TestCase): self.assertEquals(response.status_code, 404) self.assertEquals(len(self.signals), 0) -class PSHBUpdateTestCase(PSHBTestBase, TestCase): +class Test_PSHBUpdateCase(PSHBTestBase, TestCase): def test_update(self): # this data comes from diff --git a/apps/rss_feeds/tests.py b/apps/rss_feeds/test_rss_feeds.py similarity index 89% rename from apps/rss_feeds/tests.py rename to apps/rss_feeds/test_rss_feeds.py index 6eb67eb69..8e3ca41e2 100644 --- a/apps/rss_feeds/tests.py +++ b/apps/rss_feeds/test_rss_feeds.py @@ -9,8 +9,9 @@ from apps.rss_feeds.models import Feed, MStory from mongoengine.connection import connect, disconnect -class FeedTest(TestCase): - fixtures = ['rss_feeds.json'] +class Test_Feed(TestCase): + + fixtures = ['initial_data.json'] def setUp(self): disconnect() @@ -33,7 +34,7 @@ class FeedTest(TestCase): def test_load_feeds__gawker(self): self.client.login(username='conesus', password='test') - management.call_command('loaddata', 'gawker1.json', verbosity=0, commit=False, skip_checks=False) + management.call_command('loaddata', 'gawker1.json', verbosity=0, skip_checks=False) feed = Feed.objects.get(pk=10) stories = MStory.objects(story_feed_id=feed.pk) @@ -44,7 +45,7 @@ class FeedTest(TestCase): stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 38) - management.call_command('loaddata', 'gawker2.json', verbosity=0, commit=False, skip_checks=False) + management.call_command('loaddata', 'gawker2.json', verbosity=0, skip_checks=False) feed.update(force=True) @@ -60,7 +61,7 @@ class FeedTest(TestCase): def test_load_feeds__gothamist(self): self.client.login(username='conesus', password='test') - management.call_command('loaddata', 'gothamist_aug_2009_1.json', verbosity=0, commit=False, skip_checks=False) + management.call_command('loaddata', 'gothamist_aug_2009_1.json', verbosity=0, skip_checks=False) feed = Feed.objects.get(feed_link__contains='gothamist') stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 0) @@ -75,7 +76,7 @@ class FeedTest(TestCase): content = json.decode(response.content) self.assertEqual(len(content['stories']), 6) - management.call_command('loaddata', 'gothamist_aug_2009_2.json', verbosity=0, commit=False, skip_checks=False) + management.call_command('loaddata', 'gothamist_aug_2009_2.json', verbosity=0, skip_checks=False) feed.update(force=True) stories = MStory.objects(story_feed_id=feed.pk) @@ -93,13 +94,13 @@ class FeedTest(TestCase): old_story_guid = "tag:google.com,2005:reader/item/4528442633bc7b2b" - management.call_command('loaddata', 'slashdot1.json', verbosity=0, commit=False, skip_checks=False) + management.call_command('loaddata', 'slashdot1.json', verbosity=0, skip_checks=False) feed = Feed.objects.get(feed_link__contains='slashdot') stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 0) - management.call_command('refresh_feed', force=1, feed=5, single_threaded=True, daemonize=False, skip_checks=False) + management.call_command('refresh_feed', force=1, feed=5, daemonize=False, skip_checks=False) stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 38) @@ -114,8 +115,8 @@ class FeedTest(TestCase): content = json.decode(response.content) self.assertEqual(content['feeds']['5']['nt'], 37) - management.call_command('loaddata', 'slashdot2.json', verbosity=0, commit=False, skip_checks=False) - management.call_command('refresh_feed', force=1, feed=5, single_threaded=True, daemonize=False, skip_checks=False) + management.call_command('loaddata', 'slashdot2.json', verbosity=0, skip_checks=False) + management.call_command('refresh_feed', force=1, feed=5, daemonize=False, skip_checks=False) stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 38) @@ -136,13 +137,13 @@ class FeedTest(TestCase): def test_load_feeds__motherjones(self): self.client.login(username='conesus', password='test') - management.call_command('loaddata', 'motherjones1.json', verbosity=0, commit=False, skip_checks=False) + management.call_command('loaddata', 'motherjones1.json', verbosity=0, skip_checks=False) feed = Feed.objects.get(feed_link__contains='motherjones') stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 0) - management.call_command('refresh_feed', force=1, feed=feed.pk, single_threaded=True, daemonize=False, skip_checks=False) + management.call_command('refresh_feed', force=1, feed=feed.pk, daemonize=False, skip_checks=False) stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 10) @@ -157,8 +158,8 @@ class FeedTest(TestCase): content = json.decode(response.content) self.assertEqual(content['feeds'][str(feed.pk)]['nt'], 9) - management.call_command('loaddata', 'motherjones2.json', verbosity=0, commit=False, skip_checks=False) - management.call_command('refresh_feed', force=1, feed=feed.pk, single_threaded=True, daemonize=False, skip_checks=False) + management.call_command('loaddata', 'motherjones2.json', verbosity=0, skip_checks=False) + management.call_command('refresh_feed', force=1, feed=feed.pk, daemonize=False, skip_checks=False) stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 10) @@ -181,7 +182,6 @@ class FeedTest(TestCase): self.client.login(username='conesus', password='test') old_story_guid = "blog.google:443/topics/inside-google/google-earths-incredible-3d-imagery-explained/" - management.call_command('loaddata', 'google1.json', verbosity=1, skip_checks=False) print((Feed.objects.all())) feed = Feed.objects.get(pk=766) @@ -189,7 +189,7 @@ class FeedTest(TestCase): stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 0) - management.call_command('refresh_feed', force=False, feed=766, single_threaded=True, daemonize=False, skip_checks=False) + management.call_command('refresh_feed', force=False, feed=766, daemonize=False, skip_checks=False) stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 20) @@ -206,7 +206,7 @@ class FeedTest(TestCase): self.assertEqual(content['feeds']['766']['nt'], 19) management.call_command('loaddata', 'google2.json', verbosity=1, skip_checks=False) - management.call_command('refresh_feed', force=False, feed=766, single_threaded=True, daemonize=False, skip_checks=False) + management.call_command('refresh_feed', force=False, feed=766, daemonize=False, skip_checks=False) stories = MStory.objects(story_feed_id=feed.pk) self.assertEqual(stories.count(), 20) @@ -227,12 +227,12 @@ class FeedTest(TestCase): def test_load_feeds__brokelyn__invalid_xml(self): BROKELYN_FEED_ID = 16 self.client.login(username='conesus', password='test') - management.call_command('loaddata', 'brokelyn.json', verbosity=0, commit=False) + management.call_command('loaddata', 'brokelyn.json', verbosity=0) self.assertEquals(Feed.objects.get(pk=BROKELYN_FEED_ID).pk, BROKELYN_FEED_ID) - management.call_command('refresh_feed', force=1, feed=BROKELYN_FEED_ID, single_threaded=True, daemonize=False) + management.call_command('refresh_feed', force=1, feed=BROKELYN_FEED_ID, daemonize=False) - management.call_command('loaddata', 'brokelyn.json', verbosity=0, commit=False, skip_checks=False) - management.call_command('refresh_feed', force=1, feed=6, single_threaded=True, daemonize=False, skip_checks=False) + management.call_command('loaddata', 'brokelyn.json', verbosity=0, skip_checks=False) + management.call_command('refresh_feed', force=1, feed=16, daemonize=False, skip_checks=False) url = reverse('load-single-feed', kwargs=dict(feed_id=BROKELYN_FEED_ID)) response = self.client.get(url)