Merge pull request #428 from jeremycline/move-tests

Move tests inside the package and ignore them when packaging

MANIFEST.in

@@ -1,8 +1,6 @@
 include LICENSE README.rst CHANGELOG.rst requirements.txt
 include runtests.sh createdb.py nosetests migrate_wiki.py
-recursive-include anitya *
 recursive-include fedmsg.d *
-recursive-include tests *
 recursive-include files *
 recursive-include alembic *
 

anitya/tests/__init__.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © 2017  Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2, or (at your option) any later
+# version.  This program is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY expressed or implied, including the
+# implied warranties 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, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Any Red Hat trademarks that are incorporated in the source
+# code or documentation are not subject to the GNU General Public
+# License and may only be used or replicated with the express permission
+# of Red Hat, Inc.
+#
+'''
+Anitya tests.
+'''

tests/__init__.py → anitya/tests/base.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2014  Red Hat, Inc.
+# Copyright © 2014-2017  Red Hat, Inc.
 #
 # This copyrighted material is made available to anyone wishing to use,
 # modify, copy, or redistribute it subject to the terms and conditions
@@ -17,25 +17,17 @@
 # code or documentation are not subject to the GNU General Public
 # License and may only be used or replicated with the express permission
 # of Red Hat, Inc.
-#
-
-'''
-Anitya tests.
-'''
-
+"""
+Base class for Anitya tests.
+"""
 from __future__ import print_function
-import logging
-import unittest
-import sys
-import os
 
 from functools import wraps
+import unittest
+import os
 
 import vcr
 
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
-
 import anitya.lib
 import anitya.lib.model as model
 
@@ -55,10 +47,6 @@
         pass
 
 
-_log = logging.getLogger('anitya')
-_log.handlers = []
-
-
 def skip_jenkins(function):
     """ Decorator to skip tests if AUTH is set to False """
     @wraps(function)
@@ -93,7 +81,8 @@ def setUp(self):
         self.session = anitya.lib.init(DB_PATH, create=True, debug=False)
 
         anitya.lib.plugins.load_plugins(self.session)
-        self.vcr = vcr.use_cassette('tests/request-data/' + self.id())
+        cwd = os.path.dirname(os.path.realpath(__file__))
+        self.vcr = vcr.use_cassette(os.path.join(cwd, 'request-data/', self.id()))
         self.vcr.__enter__()
 
     # pylint: disable=C0103
@@ -158,6 +147,7 @@ def create_project(session):
         user_id='noreply@fedoraproject.org',
     )
 
+
 def create_ecosystem_projects(session):
     """ Create some fake projects from particular upstream ecosystems
 
@@ -187,7 +177,6 @@ def create_ecosystem_projects(session):
         user_id='noreply@fedoraproject.org'
     )
 
-
     anitya.lib.create_project(
         session,
         name='rubygems_and_maven',
@@ -244,5 +233,4 @@ def create_flagged_project(session):
 
 
 if __name__ == '__main__':
-    SUITE = unittest.TestLoader().loadTestsFromTestCase(Modeltests)
-    unittest.TextTestRunner(verbosity=2).run(SUITE)
+    unittest.main(verbosity=2)

tests/test_backend_bitbucket.py → anitya/tests/lib/backends/test_bitbucket.py

@@ -24,16 +24,11 @@
 '''
 
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.bitbucket as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'BitBucket'

tests/test_backend_cpan.py → anitya/tests/lib/backends/test_cpan.py

@@ -28,16 +28,11 @@
 
 import json
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.cpan as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'CPAN (perl)'

tests/test_backend_crates.py → anitya/tests/lib/backends/test_crates.py

@@ -23,20 +23,14 @@
 from __future__ import unicode_literals
 
 import unittest
-import sys
-import os
 
 import mock
 
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
-
 from anitya.lib.exceptions import AnityaPluginException
 from anitya.lib.backends import crates
+from anitya.tests.base import Modeltests, skip_jenkins
 import anitya.lib.model as model
 
-from tests import Modeltests, create_distro, skip_jenkins
-
 
 class CratesBackendTests(Modeltests):
     """Crates backend tests."""

tests/test_backend_custom.py → anitya/tests/lib/backends/test_custom.py

@@ -24,16 +24,11 @@
 '''
 
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.custom as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 BACKEND = 'custom'
 

tests/test_backend_debian.py → anitya/tests/lib/backends/test_debian.py

@@ -24,21 +24,15 @@
 '''
 
 import unittest
-import sys
-import os
 
 import mock
 
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
-
 from anitya.lib.exceptions import AnityaPluginException
 from anitya.lib.backends import get_versions_by_regex_for_text
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 import anitya.lib.backends.debian as backend
 import anitya.lib.model as model
 
-from tests import Modeltests, create_distro, skip_jenkins
-
 
 BACKEND = 'Debian project'
 

tests/test_backend_drupal6.py → anitya/tests/lib/backends/test_drupal6.py

@@ -28,16 +28,11 @@
 
 import json
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.drupal6 as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'Drupal6'

tests/test_backend_drupal7.py → anitya/tests/lib/backends/test_drupal7.py

@@ -28,16 +28,11 @@
 
 import json
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.drupal7 as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'Drupal7'

tests/test_backend_folder.py → anitya/tests/lib/backends/test_folder.py

@@ -24,18 +24,13 @@
 '''
 
 import unittest
-import sys
-import os
 
 import mock
 
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
-
 import anitya.lib.backends.folder as backend  # NOQA
 import anitya.lib.model as model  # NOQA
 from anitya.lib.exceptions import AnityaPluginException  # NOQA
-from tests import Modeltests, create_distro, skip_jenkins  # NOQA
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins  # NOQA
 
 
 BACKEND = 'folder'

tests/test_backend_freshmeat.py → anitya/tests/lib/backends/test_freshmeat.py

@@ -28,16 +28,11 @@
 
 import json
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.freshmeat as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'Freshmeat'

tests/test_backend_github.py → anitya/tests/lib/backends/test_github.py

@@ -24,16 +24,11 @@
 '''
 
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.github as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'GitHub'

tests/test_backend_gnome.py → anitya/tests/lib/backends/test_gnome.py

@@ -24,16 +24,11 @@
 '''
 
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.gnome as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'GNOME'

tests/test_backend_gnu.py → anitya/tests/lib/backends/test_gnu.py

@@ -28,16 +28,11 @@
 
 import json
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.gnu as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'GNU project'

tests/test_backend_google.py → anitya/tests/lib/backends/test_google.py

@@ -28,16 +28,11 @@
 
 import json
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.google as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'Google code'

tests/test_backend_hackage.py → anitya/tests/lib/backends/test_hackage.py

@@ -28,16 +28,11 @@
 
 import json
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.hackage as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'Hackage'

tests/test_backend_launchpad.py → anitya/tests/lib/backends/test_launchpad.py

@@ -28,16 +28,11 @@
 
 import json
 import unittest
-import sys
-import os
-
-sys.path.insert(0, os.path.join(os.path.dirname(
-    os.path.abspath(__file__)), '..'))
 
 import anitya.lib.backends.launchpad as backend
 import anitya.lib.model as model
 from anitya.lib.exceptions import AnityaPluginException
-from tests import Modeltests, create_distro, skip_jenkins
+from anitya.tests.base import Modeltests, create_distro, skip_jenkins
 
 
 BACKEND = 'Launchpad'