From c4311af263c3a7872cbdccf2e9ec84c615901fc9 Mon Sep 17 00:00:00 2001
From: Daniel Quinn <code@danielquinn.org>
Date: Sat, 6 Feb 2016 17:41:11 +0000
Subject: [PATCH] Cleaned up the tests

---
 src/documents/tests/consumers/__init__.py               | 0
 src/documents/tests/{consumers => }/samples/mail.txt    | 0
 src/documents/tests/{consumers/mail.py => test_mail.py} | 3 +--
 src/documents/tests/tests.py                            | 1 -
 src/pytest.ini                                          | 4 ----
 5 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 src/documents/tests/consumers/__init__.py
 rename src/documents/tests/{consumers => }/samples/mail.txt (100%)
 rename src/documents/tests/{consumers/mail.py => test_mail.py} (95%)
 delete mode 100644 src/documents/tests/tests.py
 delete mode 100644 src/pytest.ini

diff --git a/src/documents/tests/consumers/__init__.py b/src/documents/tests/consumers/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/documents/tests/consumers/samples/mail.txt b/src/documents/tests/samples/mail.txt
similarity index 100%
rename from src/documents/tests/consumers/samples/mail.txt
rename to src/documents/tests/samples/mail.txt
diff --git a/src/documents/tests/consumers/mail.py b/src/documents/tests/test_mail.py
similarity index 95%
rename from src/documents/tests/consumers/mail.py
rename to src/documents/tests/test_mail.py
index 9922d674e..366dc97b9 100644
--- a/src/documents/tests/consumers/mail.py
+++ b/src/documents/tests/test_mail.py
@@ -7,7 +7,7 @@ from hashlib import md5
 from django.conf import settings
 from django.test import TestCase
 
-from ...mail import Message, Attachment
+from ..mail import Message, Attachment
 
 
 class TestMessage(TestCase):
@@ -19,7 +19,6 @@ class TestMessage(TestCase):
             settings.BASE_DIR,
             "documents",
             "tests",
-            "consumers",
             "samples",
             "mail.txt"
         )
diff --git a/src/documents/tests/tests.py b/src/documents/tests/tests.py
deleted file mode 100644
index 342d09d29..000000000
--- a/src/documents/tests/tests.py
+++ /dev/null
@@ -1 +0,0 @@
-from .consumers.mail import TestMailFetcher
diff --git a/src/pytest.ini b/src/pytest.ini
deleted file mode 100644
index 1d62c4621..000000000
--- a/src/pytest.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pytest]
-python_files=tests.py
-DJANGO_SETTINGS_MODULE=paperless.settings
-