Move the tests folder (#25)

closeio · Aug 20, 2020 · 9e41c65 · 9e41c65
1 parent 28b5adb
commit 9e41c65
Show file tree

Hide file tree

Showing 168 changed files with 140 additions and 112 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,7 +40,7 @@ jobs:
             docker-compose run nylas bash -ec '
               pip install -e . \
               && bin/wait-for-it.sh mysql:3306 \
-              && NYLAS_ENV=test py.test inbox/test/
+              && NYLAS_ENV=test py.test tests/
             '
 
 workflows:

diff --git a/inbox/test/scheduling/conftest.py b/inbox/test/scheduling/conftest.py
diff --git a/inbox/test/search/conftest.py b/inbox/test/search/conftest.py
diff --git a/inbox/util/testutils.py b/inbox/util/testutils.py
@@ -315,7 +315,12 @@ def files(db):
     data = []
     for filename in filenames:
         path = os.path.join(
-            os.path.dirname(os.path.abspath(__file__)), "..", "test", "data", filename
+            os.path.dirname(os.path.abspath(__file__)),
+            "..",
+            "..",
+            "tests",
+            "data",
+            filename,
         ).encode("utf-8")
         data.append((filename, path))
     return data

diff --git a/inbox/test/__init__.py → tests/__init__.py b/inbox/test/__init__.py → tests/__init__.py
diff --git a/inbox/test/api/__init__.py → tests/api/__init__.py b/inbox/test/api/__init__.py → tests/api/__init__.py
diff --git a/inbox/test/api/base.py → tests/api/base.py b/inbox/test/api/base.py → tests/api/base.py
diff --git a/inbox/test/api/test_account.py → tests/api/test_account.py b/inbox/test/api/test_account.py → tests/api/test_account.py
@@ -1,11 +1,6 @@
 # flake8: noqa: F811
-from inbox.test.api.base import api_client, new_api_client
-from inbox.test.util.base import (
-    add_fake_yahoo_account,
-    db,
-    generic_account,
-    gmail_account,
-)
+from tests.api.base import api_client, new_api_client
+from tests.util.base import add_fake_yahoo_account, db, generic_account, gmail_account
 
 __all__ = ["db", "api_client", "generic_account", "gmail_account"]
 

diff --git a/inbox/test/api/test_auth.py → tests/api/test_auth.py b/inbox/test/api/test_auth.py → tests/api/test_auth.py
@@ -1,8 +1,8 @@
 import json
 from base64 import b64encode
 
-from inbox.test.api.base import new_api_client  # noqa
-from inbox.test.util.base import db, generic_account  # noqa
+from tests.api.base import new_api_client  # noqa
+from tests.util.base import db, generic_account  # noqa
 
 
 def test_no_auth(db, generic_account):  # noqa

diff --git a/inbox/test/api/test_calendars.py → tests/api/test_calendars.py b/inbox/test/api/test_calendars.py → tests/api/test_calendars.py
@@ -1,6 +1,7 @@
 from inbox.models import Calendar
-from inbox.test.api.base import api_client
-from inbox.test.util.base import add_fake_event, db, default_namespace
+
+from tests.api.base import api_client
+from tests.util.base import add_fake_event, db, default_namespace
 
 __all__ = ["api_client", "db", "default_namespace"]
 

diff --git a/inbox/test/api/test_contacts.py → tests/api/test_contacts.py b/inbox/test/api/test_contacts.py → tests/api/test_contacts.py
@@ -1,6 +1,7 @@
 from inbox.models import Contact
-from inbox.test.api.base import api_client
-from inbox.test.util.base import contact_sync, contacts_provider
+
+from tests.api.base import api_client
+from tests.util.base import contact_sync, contacts_provider
 
 __all__ = ["contacts_provider", "contact_sync", "api_client"]
 

diff --git a/inbox/test/api/test_data_processing.py → tests/api/test_data_processing.py b/inbox/test/api/test_data_processing.py → tests/api/test_data_processing.py
@@ -3,8 +3,9 @@
 from sqlalchemy.orm.exc import NoResultFound
 
 from inbox.models import DataProcessingCache
-from inbox.test.api.base import api_client
-from inbox.test.util.base import add_fake_message, add_fake_thread, default_namespace
+
+from tests.api.base import api_client
+from tests.util.base import add_fake_message, add_fake_thread, default_namespace
 
 __all__ = ["api_client", "default_namespace"]
 

diff --git a/inbox/test/api/test_drafts.py → tests/api/test_drafts.py b/inbox/test/api/test_drafts.py → tests/api/test_drafts.py
@@ -8,8 +8,8 @@
 import pytest
 from freezegun import freeze_time
 
-from inbox.test.api.base import api_client
-from inbox.test.util.base import add_fake_message, add_fake_thread
+from tests.api.base import api_client
+from tests.util.base import add_fake_message, add_fake_thread
 
 __all__ = ["api_client"]
 

diff --git a/inbox/test/api/test_event_participants.py → tests/api/test_event_participants.py b/inbox/test/api/test_event_participants.py → tests/api/test_event_participants.py
@@ -2,8 +2,8 @@
 
 import pytest
 
-from inbox.test.api.base import api_client
-from inbox.test.util.base import calendar
+from tests.api.base import api_client
+from tests.util.base import calendar
 
 __all__ = ["calendar", "api_client"]
 

diff --git a/inbox/test/api/test_event_when.py → tests/api/test_event_when.py b/inbox/test/api/test_event_when.py → tests/api/test_event_when.py
@@ -3,7 +3,7 @@
 import arrow
 import pytest
 
-from inbox.test.api.base import api_client
+from tests.api.base import api_client
 
 __all__ = ["api_client"]
 

diff --git a/inbox/test/api/test_events.py → tests/api/test_events.py b/inbox/test/api/test_events.py → tests/api/test_events.py
@@ -3,8 +3,9 @@
 from inbox.api.ns_api import API_VERSIONS
 from inbox.models import Calendar, Event
 from inbox.sqlalchemy_ext.util import generate_public_id
-from inbox.test.api.base import api_client
-from inbox.test.util.base import add_fake_event, calendar, db
+
+from tests.api.base import api_client
+from tests.util.base import add_fake_event, calendar, db
 
 __all__ = ["api_client", "calendar", "db"]
 

diff --git a/inbox/test/api/test_events_recurring.py → tests/api/test_events_recurring.py b/inbox/test/api/test_events_recurring.py → tests/api/test_events_recurring.py
@@ -5,8 +5,9 @@
 import pytest
 
 from inbox.models import Calendar, Event
-from inbox.test.api.base import api_client
-from inbox.test.util.base import message
+
+from tests.api.base import api_client
+from tests.util.base import message
 
 __all__ = ["api_client"]
 

diff --git a/inbox/test/api/test_files.py → tests/api/test_files.py b/inbox/test/api/test_files.py → tests/api/test_files.py
@@ -8,9 +8,10 @@
 import pytest
 
 from inbox.models import Block, Part
-from inbox.test.api.base import api_client
 from inbox.util.testutils import FILENAMES
 
+from tests.api.base import api_client
+
 __all__ = ["api_client"]
 
 

diff --git a/inbox/test/api/test_filtering.py → tests/api/test_filtering.py b/inbox/test/api/test_filtering.py → tests/api/test_filtering.py
@@ -5,10 +5,11 @@
 from sqlalchemy import desc
 
 from inbox.models import Block, Category, Message, Namespace, Thread
-from inbox.test.api.base import api_client
-from inbox.test.util.base import add_fake_message, add_fake_thread, test_client
 from inbox.util.misc import dt_to_timestamp
 
+from tests.api.base import api_client
+from tests.util.base import add_fake_message, add_fake_thread, test_client
+
 __all__ = ["api_client", "test_client"]
 
 

diff --git a/inbox/test/api/test_folders.py → tests/api/test_folders.py b/inbox/test/api/test_folders.py → tests/api/test_folders.py
@@ -2,10 +2,11 @@
 import gevent
 import mock
 
-from inbox.test.api.base import imap_api_client
-from inbox.test.util.base import add_fake_category, add_fake_folder
 from inbox.util.testutils import mock_imapclient  # noqa
 
+from tests.api.base import imap_api_client
+from tests.util.base import add_fake_category, add_fake_folder
+
 
 # Check that folders of the form INBOX.A.B get converted by the API
 # to A/B.

diff --git a/inbox/test/api/test_folders_labels.py → tests/api/test_folders_labels.py b/inbox/test/api/test_folders_labels.py → tests/api/test_folders_labels.py
@@ -7,8 +7,9 @@
 
 from inbox.api.ns_api import API_VERSIONS
 from inbox.models.category import EPOCH, Category
-from inbox.test.api.base import api_client, new_api_client
-from inbox.test.util.base import (
+
+from tests.api.base import api_client, new_api_client
+from tests.util.base import (
     add_fake_message,
     add_fake_thread,
     generic_account,

diff --git a/inbox/test/api/test_invalid_account.py → tests/api/test_invalid_account.py b/inbox/test/api/test_invalid_account.py → tests/api/test_invalid_account.py
@@ -5,8 +5,8 @@
 import pytest
 import requests
 
-from inbox.test.api.base import api_client
-from inbox.test.util.base import db
+from tests.api.base import api_client
+from tests.util.base import db
 
 __all__ = ["api_client", "db"]
 

diff --git a/inbox/test/api/test_messages.py → tests/api/test_messages.py b/inbox/test/api/test_messages.py → tests/api/test_messages.py
@@ -5,8 +5,10 @@
 import pytest
 
 from inbox.api.ns_api import API_VERSIONS
-from inbox.test.api.base import api_client, new_api_client
-from inbox.test.util.base import (
+from inbox.util.blockstore import get_from_blockstore
+
+from tests.api.base import api_client, new_api_client
+from tests.util.base import (
     add_fake_message,
     add_fake_thread,
     default_namespace,
@@ -16,7 +18,6 @@
     new_message_from_synced,
     thread,
 )
-from inbox.util.blockstore import get_from_blockstore
 
 __all__ = [
     "api_client",

diff --git a/inbox/test/api/test_metrics_api.py → tests/api/test_metrics_api.py b/inbox/test/api/test_metrics_api.py → tests/api/test_metrics_api.py
@@ -3,7 +3,8 @@
 import pytest
 
 from inbox.ignition import redis_txn
-from inbox.test.util.base import add_fake_message
+
+from tests.util.base import add_fake_message
 
 
 class TestGlobalDeltas:

diff --git a/inbox/test/api/test_searching.py → tests/api/test_searching.py b/inbox/test/api/test_searching.py → tests/api/test_searching.py
@@ -12,8 +12,9 @@
 from inbox.search.backends.gmail import GmailSearchClient
 from inbox.search.backends.imap import IMAPSearchClient
 from inbox.search.base import get_search_client
-from inbox.test.api.base import api_client, imap_api_client
-from inbox.test.util.base import (
+
+from tests.api.base import api_client, imap_api_client
+from tests.util.base import (
     add_fake_folder,
     add_fake_imapuid,
     add_fake_message,

diff --git a/inbox/test/api/test_sending.py → tests/api/test_sending.py b/inbox/test/api/test_sending.py → tests/api/test_sending.py
@@ -15,8 +15,9 @@
 from inbox.basicauth import OAuthError
 from inbox.models import Event, Message
 from inbox.sendmail.smtp.postel import _substitute_bcc
-from inbox.test.api.base import api_client
-from inbox.test.util.base import imported_event, message, thread
+
+from tests.api.base import api_client
+from tests.util.base import imported_event, message, thread
 
 __all__ = ["thread", "message", "api_client", "imported_event"]
 

diff --git a/inbox/test/api/test_streaming.py → tests/api/test_streaming.py b/inbox/test/api/test_streaming.py → tests/api/test_streaming.py
@@ -4,10 +4,11 @@
 import pytest
 from gevent import Greenlet
 
-from inbox.test.api.base import api_client
-from inbox.test.util.base import add_fake_message
 from inbox.util.url import url_concat
 
+from tests.api.base import api_client
+from tests.util.base import add_fake_message
+
 GEVENT_EPSILON = 0.5  # Greenlet switching time. VMs on Macs suck :()
 LONGPOLL_EPSILON = 2 + GEVENT_EPSILON  # API implementation polls every second
 

diff --git a/inbox/test/api/test_threads.py → tests/api/test_threads.py b/inbox/test/api/test_threads.py → tests/api/test_threads.py
@@ -4,8 +4,9 @@
 import pytest
 
 from inbox.api.ns_api import API_VERSIONS
-from inbox.test.api.base import api_client
-from inbox.test.util.base import add_fake_message, add_fake_thread, db, default_account
+
+from tests.api.base import api_client
+from tests.util.base import add_fake_message, add_fake_thread, db, default_account
 
 __all__ = ["db", "api_client", "default_account"]
 

diff --git a/inbox/test/api/test_validation.py → tests/api/test_validation.py b/inbox/test/api/test_validation.py → tests/api/test_validation.py
@@ -5,8 +5,9 @@
 
 from inbox.api.validation import noop_event_update, valid_email
 from inbox.models import Namespace
-from inbox.test.api.base import api_client
-from inbox.test.util.base import add_fake_event, calendar, db
+
+from tests.api.base import api_client
+from tests.util.base import add_fake_event, calendar, db
 
 __all__ = ["api_client", "db", "calendar"]
 

diff --git a/inbox/test/api/test_views.py → tests/api/test_views.py b/inbox/test/api/test_views.py → tests/api/test_views.py
@@ -1,8 +1,8 @@
 # flake8: noqa: F811
 import pytest
 
-from inbox.test.api.base import api_client, new_api_client
-from inbox.test.util.base import generic_account
+from tests.api.base import api_client, new_api_client
+from tests.util.base import generic_account
 
 __all__ = ["api_client", "generic_account"]
 

diff --git a/inbox/test/auth/__init__.py → tests/auth/__init__.py b/inbox/test/auth/__init__.py → tests/auth/__init__.py
diff --git a/inbox/test/auth/providers/__init__.py → tests/auth/providers/__init__.py b/inbox/test/auth/providers/__init__.py → tests/auth/providers/__init__.py
diff --git a/inbox/test/auth/providers/mock_gmail.py → tests/auth/providers/mock_gmail.py b/inbox/test/auth/providers/mock_gmail.py → tests/auth/providers/mock_gmail.py
diff --git a/inbox/test/auth/test_generic_auth.py → tests/auth/test_generic_auth.py b/inbox/test/auth/test_generic_auth.py → tests/auth/test_generic_auth.py
diff --git a/inbox/test/auth/test_gmail_auth.py → tests/auth/test_gmail_auth.py b/inbox/test/auth/test_gmail_auth.py → tests/auth/test_gmail_auth.py
diff --git a/.../test/auth/test_gmail_auth_credentials.py → tests/auth/test_gmail_auth_credentials.py b/.../test/auth/test_gmail_auth_credentials.py → tests/auth/test_gmail_auth_credentials.py
diff --git a/inbox/test/auth/test_imap_smtp_auth.py → tests/auth/test_imap_smtp_auth.py b/inbox/test/auth/test_imap_smtp_auth.py → tests/auth/test_imap_smtp_auth.py
diff --git a/inbox/test/auth/test_ssl_auth.py → tests/auth/test_ssl_auth.py b/inbox/test/auth/test_ssl_auth.py → tests/auth/test_ssl_auth.py
diff --git a/inbox/test/conftest.py → tests/conftest.py b/inbox/test/conftest.py → tests/conftest.py
@@ -9,11 +9,12 @@
 
 gevent_openssl.monkey_patch()
 
-from inbox.test.util.base import *  # noqa
 from inbox.util.testutils import files  # noqa
 from inbox.util.testutils import mock_dns_resolver  # noqa
 from inbox.util.testutils import mock_imapclient  # noqa
 from inbox.util.testutils import mock_smtp_get_connection  # noqa
 from inbox.util.testutils import uploaded_file_ids
 
+from tests.util.base import *  # noqa
+
 from inbox.util.testutils import dump_dns_queries  # noqa; noqa
diff --git a/inbox/test/contacts/test_process_mail.py → tests/contacts/test_process_mail.py b/inbox/test/contacts/test_process_mail.py → tests/contacts/test_process_mail.py
@@ -1,7 +1,8 @@
 """Sanity-check our logic for updating contact data from message addressees
 during a sync."""
 from inbox.models import Contact
-from inbox.test.util.base import add_fake_message
+
+from tests.util.base import add_fake_message
 
 
 def test_update_contacts_from_message(db, default_namespace, thread):

diff --git a/inbox/test/contacts/test_remote_sync.py → tests/contacts/test_remote_sync.py b/inbox/test/contacts/test_remote_sync.py → tests/contacts/test_remote_sync.py
@@ -1,7 +1,8 @@
 import pytest
 
 from inbox.models import Contact
-from inbox.test.util.base import ContactsProviderStub, contact_sync, contacts_provider
+
+from tests.util.base import ContactsProviderStub, contact_sync, contacts_provider
 
 __all__ = ["contact_sync", "contacts_provider"]
 

diff --git a/inbox/test/data/.agignore → tests/data/.agignore b/inbox/test/data/.agignore → tests/data/.agignore
diff --git a/inbox/test/data/LetMeSendYouEmail.wav → tests/data/LetMeSendYouEmail.wav b/inbox/test/data/LetMeSendYouEmail.wav → tests/data/LetMeSendYouEmail.wav
diff --git a/inbox/test/data/__init__.py → tests/data/__init__.py b/inbox/test/data/__init__.py → tests/data/__init__.py
diff --git a/inbox/test/data/andra-moi-ennepe.txt → tests/data/andra-moi-ennepe.txt b/inbox/test/data/andra-moi-ennepe.txt → tests/data/andra-moi-ennepe.txt
diff --git a/...ata/general_test_provider_resolution.json → ...ata/general_test_provider_resolution.json b/...ata/general_test_provider_resolution.json → ...ata/general_test_provider_resolution.json
diff --git a/inbox/test/data/invite.ics → tests/data/invite.ics b/inbox/test/data/invite.ics → tests/data/invite.ics
diff --git a/inbox/test/data/long-non-ascii-filename.txt → tests/data/long-non-ascii-filename.txt b/inbox/test/data/long-non-ascii-filename.txt → tests/data/long-non-ascii-filename.txt
diff --git a/inbox/test/data/muir.jpg → tests/data/muir.jpg b/inbox/test/data/muir.jpg → tests/data/muir.jpg
diff --git a/inbox/test/data/piece-jointe.jpg → tests/data/piece-jointe.jpg b/inbox/test/data/piece-jointe.jpg → tests/data/piece-jointe.jpg
diff --git a/.../data/raw_message_with_bad_attachment.txt → .../data/raw_message_with_bad_attachment.txt b/.../data/raw_message_with_bad_attachment.txt → .../data/raw_message_with_bad_attachment.txt
diff --git a/.../raw_message_with_filename_attachment.txt → .../raw_message_with_filename_attachment.txt b/.../raw_message_with_filename_attachment.txt → .../raw_message_with_filename_attachment.txt
diff --git a/...est/data/raw_message_with_ical_invite.txt → tests/data/raw_message_with_ical_invite.txt b/...est/data/raw_message_with_ical_invite.txt → tests/data/raw_message_with_ical_invite.txt
diff --git a/...ta/raw_message_with_inline_attachment.txt → ...ta/raw_message_with_inline_attachment.txt b/...ta/raw_message_with_inline_attachment.txt → ...ta/raw_message_with_inline_attachment.txt
diff --git a/...data/raw_message_with_long_content_id.txt → ...data/raw_message_with_long_content_id.txt b/...data/raw_message_with_long_content_id.txt → ...data/raw_message_with_long_content_id.txt
diff --git a/...data/raw_message_with_long_message_id.txt → ...data/raw_message_with_long_message_id.txt b/...data/raw_message_with_long_message_id.txt → ...data/raw_message_with_long_message_id.txt
diff --git a/...data/raw_message_with_many_recipients.txt → ...data/raw_message_with_many_recipients.txt b/...data/raw_message_with_many_recipients.txt → ...data/raw_message_with_many_recipients.txt
diff --git a/...data/raw_message_with_name_attachment.txt → ...data/raw_message_with_name_attachment.txt b/...data/raw_message_with_name_attachment.txt → ...data/raw_message_with_name_attachment.txt
diff --git a/...t/data/raw_message_with_outlook_emoji.txt → ...s/data/raw_message_with_outlook_emoji.txt b/...t/data/raw_message_with_outlook_emoji.txt → ...s/data/raw_message_with_outlook_emoji.txt
diff --git a/...raw_message_with_outlook_emoji_inline.txt → ...raw_message_with_outlook_emoji_inline.txt b/...raw_message_with_outlook_emoji_inline.txt → ...raw_message_with_outlook_emoji_inline.txt
diff --git a/inbox/test/data/self_signed_cert.key → tests/data/self_signed_cert.key b/inbox/test/data/self_signed_cert.key → tests/data/self_signed_cert.key
diff --git a/inbox/test/data/self_signed_cert.pem → tests/data/self_signed_cert.pem b/inbox/test/data/self_signed_cert.pem → tests/data/self_signed_cert.pem
diff --git a/...events/fixtures/bogus_sequence_number.ics → ...events/fixtures/bogus_sequence_number.ics b/...events/fixtures/bogus_sequence_number.ics → ...events/fixtures/bogus_sequence_number.ics
diff --git a/...s/fixtures/event_with_no_participants.ics → ...s/fixtures/event_with_no_participants.ics b/...s/fixtures/event_with_no_participants.ics → ...s/fixtures/event_with_no_participants.ics
diff --git a/...vents/fixtures/event_without_sequence.ics → ...vents/fixtures/event_without_sequence.ics b/...vents/fixtures/event_without_sequence.ics → ...vents/fixtures/event_without_sequence.ics
diff --git a/inbox/test/events/fixtures/gcal_recur.ics → tests/events/fixtures/gcal_recur.ics b/inbox/test/events/fixtures/gcal_recur.ics → tests/events/fixtures/gcal_recur.ics
diff --git a/inbox/test/events/fixtures/gcal_v1.ics → tests/events/fixtures/gcal_v1.ics b/inbox/test/events/fixtures/gcal_v1.ics → tests/events/fixtures/gcal_v1.ics
diff --git a/inbox/test/events/fixtures/gcal_v2.ics → tests/events/fixtures/gcal_v2.ics b/inbox/test/events/fixtures/gcal_v2.ics → tests/events/fixtures/gcal_v2.ics
diff --git a/...est/events/fixtures/google_cancelled1.ics → tests/events/fixtures/google_cancelled1.ics b/...est/events/fixtures/google_cancelled1.ics → tests/events/fixtures/google_cancelled1.ics
diff --git a/...est/events/fixtures/google_cancelled2.ics → tests/events/fixtures/google_cancelled2.ics b/...est/events/fixtures/google_cancelled2.ics → tests/events/fixtures/google_cancelled2.ics
diff --git a/...est/events/fixtures/icloud_cancelled1.ics → tests/events/fixtures/icloud_cancelled1.ics b/...est/events/fixtures/icloud_cancelled1.ics → tests/events/fixtures/icloud_cancelled1.ics
diff --git a/...est/events/fixtures/icloud_cancelled2.ics → tests/events/fixtures/icloud_cancelled2.ics b/...est/events/fixtures/icloud_cancelled2.ics → tests/events/fixtures/icloud_cancelled2.ics
diff --git a/...t/events/fixtures/icloud_oneday_event.ics → ...s/events/fixtures/icloud_oneday_event.ics b/...t/events/fixtures/icloud_oneday_event.ics → ...s/events/fixtures/icloud_oneday_event.ics
diff --git a/inbox/test/events/fixtures/invalid_rsvp.ics → tests/events/fixtures/invalid_rsvp.ics b/inbox/test/events/fixtures/invalid_rsvp.ics → tests/events/fixtures/invalid_rsvp.ics
diff --git a/inbox/test/events/fixtures/invalid_rsvp2.ics → tests/events/fixtures/invalid_rsvp2.ics b/inbox/test/events/fixtures/invalid_rsvp2.ics → tests/events/fixtures/invalid_rsvp2.ics
diff --git a/.../test/events/fixtures/invite_w_rsvps1.ics → tests/events/fixtures/invite_w_rsvps1.ics b/.../test/events/fixtures/invite_w_rsvps1.ics → tests/events/fixtures/invite_w_rsvps1.ics
diff --git a/.../test/events/fixtures/invite_w_rsvps2.ics → tests/events/fixtures/invite_w_rsvps2.ics b/.../test/events/fixtures/invite_w_rsvps2.ics → tests/events/fixtures/invite_w_rsvps2.ics
diff --git a/.../test/events/fixtures/invite_w_rsvps3.ics → tests/events/fixtures/invite_w_rsvps3.ics b/.../test/events/fixtures/invite_w_rsvps3.ics → tests/events/fixtures/invite_w_rsvps3.ics
diff --git a/...test/events/fixtures/invite_w_rsvps_4.ics → tests/events/fixtures/invite_w_rsvps_4.ics b/...test/events/fixtures/invite_w_rsvps_4.ics → tests/events/fixtures/invite_w_rsvps_4.ics
diff --git a/...ents/fixtures/iphone_through_exchange.ics → ...ents/fixtures/iphone_through_exchange.ics b/...ents/fixtures/iphone_through_exchange.ics → ...ents/fixtures/iphone_through_exchange.ics
diff --git a/.../test/events/fixtures/meetup_infinite.ics → tests/events/fixtures/meetup_infinite.ics b/.../test/events/fixtures/meetup_infinite.ics → tests/events/fixtures/meetup_infinite.ics
diff --git a/.../test/events/fixtures/multiple_events.ics → tests/events/fixtures/multiple_events.ics b/.../test/events/fixtures/multiple_events.ics → tests/events/fixtures/multiple_events.ics
diff --git a/...st/events/fixtures/multiple_summaries.ics → tests/events/fixtures/multiple_summaries.ics b/...st/events/fixtures/multiple_summaries.ics → tests/events/fixtures/multiple_summaries.ics
diff --git a/inbox/test/events/fixtures/self_sent_v1.ics → tests/events/fixtures/self_sent_v1.ics b/inbox/test/events/fixtures/self_sent_v1.ics → tests/events/fixtures/self_sent_v1.ics
diff --git a/inbox/test/events/fixtures/self_sent_v2.ics → tests/events/fixtures/self_sent_v2.ics b/inbox/test/events/fixtures/self_sent_v2.ics → tests/events/fixtures/self_sent_v2.ics
diff --git a/inbox/test/events/fixtures/windows_event.ics → tests/events/fixtures/windows_event.ics b/inbox/test/events/fixtures/windows_event.ics → tests/events/fixtures/windows_event.ics
diff --git a/inbox/test/events/test_datetime.py → tests/events/test_datetime.py b/inbox/test/events/test_datetime.py → tests/events/test_datetime.py
diff --git a/inbox/test/events/test_events_util.py → tests/events/test_events_util.py b/inbox/test/events/test_events_util.py → tests/events/test_events_util.py
diff --git a/inbox/test/events/test_google_events.py → tests/events/test_google_events.py b/inbox/test/events/test_google_events.py → tests/events/test_google_events.py
diff --git a/inbox/test/events/test_ics_parsing.py → tests/events/test_ics_parsing.py b/inbox/test/events/test_ics_parsing.py → tests/events/test_ics_parsing.py
@@ -6,7 +6,8 @@
 from inbox.events.ical import events_from_ics, import_attached_events
 from inbox.events.util import MalformedEventError
 from inbox.models.event import Event, RecurringEvent
-from inbox.test.util.base import (
+
+from tests.util.base import (
     absolute_path,
     add_fake_calendar,
     add_fake_msg_with_calendar_part,

diff --git a/inbox/test/events/test_inviting.py → tests/events/test_inviting.py b/inbox/test/events/test_inviting.py → tests/events/test_inviting.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa: F401,F811
-from inbox.test.util.base import event
+from tests.util.base import event
 
 
 def test_invite_generation(event, default_account):

diff --git a/inbox/test/events/test_merge.py → tests/events/test_merge.py b/inbox/test/events/test_merge.py → tests/events/test_merge.py
diff --git a/inbox/test/events/test_recurrence.py → tests/events/test_recurrence.py b/inbox/test/events/test_recurrence.py → tests/events/test_recurrence.py
diff --git a/inbox/test/events/test_rsvp.py → tests/events/test_rsvp.py b/inbox/test/events/test_rsvp.py → tests/events/test_rsvp.py
diff --git a/inbox/test/events/test_sync.py → tests/events/test_sync.py b/inbox/test/events/test_sync.py → tests/events/test_sync.py
diff --git a/inbox/test/general/__init__.py → tests/general/__init__.py b/inbox/test/general/__init__.py → tests/general/__init__.py
diff --git a/inbox/test/general/test_account.py → tests/general/test_account.py b/inbox/test/general/test_account.py → tests/general/test_account.py
@@ -1,6 +1,6 @@
 import pytest
 
-from inbox.test.util.base import add_fake_gmail_account, add_generic_imap_account
+from tests.util.base import add_fake_gmail_account, add_generic_imap_account
 
 
 def add_fake_imap_account(db_session, provider, email_address, password):

diff --git a/.../general/test_address_canonicalization.py → .../general/test_address_canonicalization.py b/.../general/test_address_canonicalization.py → .../general/test_address_canonicalization.py
diff --git a/inbox/test/general/test_category.py → tests/general/test_category.py b/inbox/test/general/test_category.py → tests/general/test_category.py
@@ -2,7 +2,8 @@
 from inbox.models import Folder, Label
 from inbox.models.category import sanitize_name
 from inbox.models.constants import MAX_INDEXABLE_LENGTH
-from inbox.test.util.base import (
+
+from tests.util.base import (
     add_fake_folder,
     add_fake_label,
     db,

diff --git a/inbox/test/general/test_concurrency.py → tests/general/test_concurrency.py b/inbox/test/general/test_concurrency.py → tests/general/test_concurrency.py
diff --git a/inbox/test/general/test_draft_creation.py → tests/general/test_draft_creation.py b/inbox/test/general/test_draft_creation.py → tests/general/test_draft_creation.py
diff --git a/.../test/general/test_filename_truncation.py → tests/general/test_filename_truncation.py b/.../test/general/test_filename_truncation.py → tests/general/test_filename_truncation.py
diff --git a/inbox/test/general/test_html_parsing.py → tests/general/test_html_parsing.py b/inbox/test/general/test_html_parsing.py → tests/general/test_html_parsing.py
diff --git a/inbox/test/general/test_ignition.py → tests/general/test_ignition.py b/inbox/test/general/test_ignition.py → tests/general/test_ignition.py
diff --git a/inbox/test/general/test_lock.py → tests/general/test_lock.py b/inbox/test/general/test_lock.py → tests/general/test_lock.py