Fix setuptools' test suite spec.

2 files changed, 33 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index f0713bf..3feb275 100644
--- a/setup.py
+++ b/setup.py
@@ -17,8 +17,11 @@
 """
 setup file for leap.mail
 """
+
+
 from setuptools import setup, find_packages
 
+
 requirements = [
     "leap.soledad",
     "leap.common>=0.2.3-dev",
@@ -32,7 +35,6 @@ tests_requirements = [
 ]
 
 # XXX add classifiers, docs
-
 setup(
     name='leap.mail',
     version='0.2.0-dev',
@@ -46,8 +48,8 @@ setup(
     ),
     namespace_packages=["leap"],
     package_dir={'': 'src'},
-    packages=find_packages('src', exclude=['leap.mail.tests']),
-    test_suite='leap.mail.tests',
+    packages=find_packages('src'),
+    test_suite='leap.mail.load_tests',
     install_requires=requirements,
     tests_require=tests_requirements,
 )
diff --git a/src/leap/mail/__init__.py b/src/leap/mail/__init__.py
index e69de29..04a9951 100644
--- a/src/leap/mail/__init__.py
+++ b/src/leap/mail/__init__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# __init__.py
+# Copyright (C) 2013 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+"""
+Provide function for loading tests.
+"""
+
+
+import unittest
+
+
+def load_tests():
+    return unittest.defaultTestLoader.discover('./src/leap/mail')