Rename some tests to make the naming more obvious

mailme · Apr 22, 2014 · dc321da · dc321da
1 parent 17c7cc6
commit dc321da
Show file tree

Hide file tree

Showing 33 changed files with 3 additions and 3 deletions.
diff --git a/src/mailme/tests/factories/core.py → src/mailme/tests/factories/user.py b/src/mailme/tests/factories/core.py → src/mailme/tests/factories/user.py
diff --git a/src/mailme/tests/collector/__init__.py → src/mailme/tests/models/__init__.py b/src/mailme/tests/collector/__init__.py → src/mailme/tests/models/__init__.py
diff --git a/src/mailme/tests/core/test_core.py → src/mailme/tests/models/test_models.py b/src/mailme/tests/core/test_core.py → src/mailme/tests/models/test_models.py
diff --git a/src/mailme/tests/core/__init__.py → src/mailme/tests/services/__init__.py b/src/mailme/tests/core/__init__.py → src/mailme/tests/services/__init__.py
diff --git a/...me/tests/collector/data/bbc_homepage.html → ...lme/tests/services/data/bbc_homepage.html b/...me/tests/collector/data/bbc_homepage.html → ...lme/tests/services/data/bbc_homepage.html
diff --git a/...ilme/tests/collector/data/buggy_dates.rss → ...ailme/tests/services/data/buggy_dates.rss b/...ilme/tests/collector/data/buggy_dates.rss → ...ailme/tests/services/data/buggy_dates.rss
diff --git a/...s/collector/data/buggy_dates_and_guid.rss → ...ts/services/data/buggy_dates_and_guid.rss b/...s/collector/data/buggy_dates_and_guid.rss → ...ts/services/data/buggy_dates_and_guid.rss
diff --git a/...lme/tests/collector/data/chooseopera.html → ...ilme/tests/services/data/chooseopera.html b/...lme/tests/collector/data/chooseopera.html → ...ilme/tests/services/data/chooseopera.html
diff --git a/...ilme/tests/collector/data/dailymotion.rss → ...ailme/tests/services/data/dailymotion.rss b/...ilme/tests/collector/data/dailymotion.rss → ...ailme/tests/services/data/dailymotion.rss
diff --git a/...e/tests/collector/data/elcomercio.pe.html → ...me/tests/services/data/elcomercio.pe.html b/...e/tests/collector/data/elcomercio.pe.html → ...me/tests/services/data/elcomercio.pe.html
diff --git a/...sts/collector/data/example_empty.feed.rss → ...ests/services/data/example_empty.feed.rss b/...sts/collector/data/example_empty.feed.rss → ...ests/services/data/example_empty.feed.rss
diff --git a/...tor/data/example_feed-content_encoded.rss → ...ces/data/example_feed-content_encoded.rss b/...tor/data/example_feed-content_encoded.rss → ...ces/data/example_feed-content_encoded.rss
diff --git a/...lme/tests/collector/data/example_feed.rss → ...ilme/tests/services/data/example_feed.rss b/...lme/tests/collector/data/example_feed.rss → ...ilme/tests/services/data/example_feed.rss
diff --git a/src/mailme/tests/collector/data/fakultet.xml → src/mailme/tests/services/data/fakultet.xml b/src/mailme/tests/collector/data/fakultet.xml → src/mailme/tests/services/data/fakultet.xml
diff --git a/...lme/tests/collector/data/foxnews.com.html → ...ilme/tests/services/data/foxnews.com.html b/...lme/tests/collector/data/foxnews.com.html → ...ilme/tests/services/data/foxnews.com.html
diff --git a/src/mailme/tests/collector/data/lefigaro.rss → src/mailme/tests/services/data/lefigaro.rss b/src/mailme/tests/collector/data/lefigaro.rss → src/mailme/tests/services/data/lefigaro.rss
diff --git a/src/mailme/tests/collector/data/mk.ru.html → src/mailme/tests/services/data/mk.ru.html b/src/mailme/tests/collector/data/mk.ru.html → src/mailme/tests/services/data/mk.ru.html
diff --git a/...mailme/tests/collector/data/mobile_it.rss → src/mailme/tests/services/data/mobile_it.rss b/...mailme/tests/collector/data/mobile_it.rss → src/mailme/tests/services/data/mobile_it.rss
diff --git a/...sts/collector/data/newsweek_homepage.html → ...ests/services/data/newsweek_homepage.html b/...sts/collector/data/newsweek_homepage.html → ...ests/services/data/newsweek_homepage.html
diff --git a/src/mailme/tests/collector/data/no-steam.rss → src/mailme/tests/services/data/no-steam.rss b/src/mailme/tests/collector/data/no-steam.rss → src/mailme/tests/services/data/no-steam.rss
diff --git a/src/mailme/tests/collector/data/opml1.xml → src/mailme/tests/services/data/opml1.xml b/src/mailme/tests/collector/data/opml1.xml → src/mailme/tests/services/data/opml1.xml
diff --git a/src/mailme/tests/collector/data/poker_pl.rss → src/mailme/tests/services/data/poker_pl.rss b/src/mailme/tests/collector/data/poker_pl.rss → src/mailme/tests/services/data/poker_pl.rss
diff --git a/src/mailme/tests/collector/data/smp.no.html → src/mailme/tests/services/data/smp.no.html b/src/mailme/tests/collector/data/smp.no.html → src/mailme/tests/services/data/smp.no.html
diff --git a/src/mailme/tests/collector/data/t1.xml → src/mailme/tests/services/data/t1.xml b/src/mailme/tests/collector/data/t1.xml → src/mailme/tests/services/data/t1.xml
diff --git a/src/mailme/tests/collector/data/t2.xml → src/mailme/tests/services/data/t2.xml b/src/mailme/tests/collector/data/t2.xml → src/mailme/tests/services/data/t2.xml
diff --git a/src/mailme/tests/collector/data/t3.xml → src/mailme/tests/services/data/t3.xml b/src/mailme/tests/collector/data/t3.xml → src/mailme/tests/services/data/t3.xml
diff --git a/src/mailme/tests/collector/data/t4.xml → src/mailme/tests/services/data/t4.xml b/src/mailme/tests/collector/data/t4.xml → src/mailme/tests/services/data/t4.xml
diff --git a/src/mailme/tests/collector/data/t5.xml → src/mailme/tests/services/data/t5.xml b/src/mailme/tests/collector/data/t5.xml → src/mailme/tests/services/data/t5.xml
diff --git a/src/mailme/tests/collector/data/time_mk.rss → src/mailme/tests/services/data/time_mk.rss b/src/mailme/tests/collector/data/time_mk.rss → src/mailme/tests/services/data/time_mk.rss
diff --git a/...ilme/tests/collector/test_feed_backend.py → ...ailme/tests/services/test_feed_backend.py b/...ilme/tests/collector/test_feed_backend.py → ...ailme/tests/services/test_feed_backend.py
diff --git a/src/mailme/tests/core/test_views.py → src/mailme/tests/web/test_logout.py b/src/mailme/tests/core/test_views.py → src/mailme/tests/web/test_logout.py
@@ -1,6 +1,6 @@
 import pytest
 
-from mailme.tests.factories.core import UserFactory
+from mailme.tests.factories.user import UserFactory
 
 
 @pytest.mark.django_db

diff --git a/src/mailme/tests/web/test_social.py b/src/mailme/tests/web/test_social.py
@@ -10,7 +10,7 @@
 from mailme.models.user import User
 from mailme.testutils import get_messages_from_cookie
 
-from mailme.tests.factories.core import profile_complete_form_data, UserFactory
+from mailme.tests.factories.user import profile_complete_form_data, UserFactory
 from mailme.tests.web.fixtures import facebook_auth, twitter_auth, google_auth  # noqa
 
 

diff --git a/src/mailme/utils/logging.py b/src/mailme/utils/logging.py
@@ -1,4 +1,4 @@
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 import logging
 import inspect