fix testsuite

.github/workflows/fedora-tox.yml

@@ -12,18 +12,37 @@ jobs:
   tox_test:
     name: Tox test
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Run Tox tests
         id: test
         uses: fedora-python/tox-github-action@main
         with:
           tox_env: ${{ matrix.tox_env }}
+          dnf_install: >
+            asciidoc
+            createrepo_c
+            docbook-style-xsl
+            git
+            git
+            git-annex
+            libxslt
+            python3-bugzilla
+            python3-rpm
+            rpm-build
+            rpmdevtools
+            rsync
+            which
     strategy:
       matrix:
         tox_env:
+          # sync with /tox.ini
+          - py36
           - py37
-          - py310
           - py311
+          - py312
+          - py313
 
     # Use GitHub's Linux Docker host
     runs-on: ubuntu-latest

.gitignore

@@ -4,7 +4,6 @@
 *$py.class
 *.swp
 *.swo
-.noseids
 *.patch
 *#
 *~
@@ -14,6 +13,8 @@ MANIFEST
 dist
 build
 .build
+.coverage
+.test-titodir
 titorc.5
 titorc.5.xml
 tito.8

HACKING.md

@@ -86,8 +86,8 @@ an authoring environment, too.
 
 To run all tests, install these packages:
 
-* python-nose,  python-pep8,  python-mock (for epl-6 and fedora) and rpm-python
-* python3-nose, python3-pep8,  python3-mock (for epl-6 and fedora) , and rpm-python3
+* pytest, python-pep8,  python-mock (for epl-6 and fedora) and rpm-python
+* pytest, python3-pep8,  python3-mock (for epl-6 and fedora) , and rpm-python3
 * createrepo_c
 * git-annex
 
@@ -98,8 +98,7 @@ for python 2.4 - 2.7 (in case you don't have pip, install via yum python-pip pac
 
 Then from the root of the project:
 
-    python  ./runtests.py -vv
-    python3 ./runtests.py -vv
+    ./runtests.sh
 
 
 ### Advanced

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+python_files = test/*.py test/*/*.py
+pythonpath = src

requirements.txt

@@ -1 +1,2 @@
 blessed
+requests

runtests.sh

@@ -0,0 +1,10 @@
+#! /bin/bash -e
+cov=--cov
+args=()
+for arg; do
+case $arg in
+--no-cov) cov= ;;
+*) args+=( "$arg" )
+esac
+done
+PYTHONPATH=$PWD/src exec python3 -m pytest -vv $cov "${args[@]}"

src/tito/builder/main.py

@@ -22,7 +22,6 @@
 import shutil
 import rpm
 from pkg_resources import require
-from distutils.version import LooseVersion as loose_version
 from tempfile import mkdtemp
 
 from tito.common import scl_to_rpm_option, get_latest_tagged_version, \
@@ -34,7 +33,8 @@
     find_cheetah_template_file, render_cheetah, replace_spec_release, \
     find_spec_like_file, warn_out, get_commit_timestamp, chdir, mkdir_p, \
     find_git_root, info_out, munge_specfile, BUILDCONFIG_SECTION
-from tito.compat import getstatusoutput, getoutput, urlparse, urlretrieve
+from tito.compat import (getstatusoutput, getoutput, urlparse, urlretrieve,
+                         Version)
 from tito.exception import RunCommandException
 from tito.exception import TitoException
 from tito.config_object import ConfigObject
@@ -406,8 +406,8 @@ def __init__(self, name=None, tag=None, build_dir=None,
 
         if self.config.has_section("requirements"):
             if self.config.has_option("requirements", "tito"):
-                if loose_version(self.config.get("requirements", "tito")) > \
-                        loose_version(require('tito')[0].version):
+                if Version(self.config.get("requirements", "tito")) > \
+                        Version(require('tito')[0].version):
                     error_out([
                         "tito version %s or later is needed to build this project." %
                         self.config.get("requirements", "tito"),

src/tito/cli.py

@@ -29,10 +29,6 @@
 from tito.compat import RawConfigParser, getstatusoutput, getoutput
 from tito.exception import TitoException
 
-# Hack for Python 2.4, seems to require we import these so they get compiled
-# before we try to dynamically import them based on a string name.
-import tito.tagger  # NOQA
-
 PROGNAME = "tito"
 TITO_PROPS = "tito.props"
 RELEASERS_CONF_FILENAME = "releasers.conf"

src/tito/compat.py

@@ -12,13 +12,20 @@
 # in this software or its documentation.
 
 # flake8: noqa
+# pylint: disable=unused-import,deprecated-module,function-redefined
 
 """
 Compatibility library for Python 2.4 up through Python 3.
 """
 import os
 import sys
 import contextlib
+
+try:
+    from packaging.version import Version
+except ImportError:
+    from distutils.version import LooseVersion as Version
+
 ENCODING = sys.getdefaultencoding()
 PY2 = sys.version_info[0] == 2
 if PY2:

test/functional/__init__.py

@@ -0,0 +1,5 @@
+"""
+Tito testsuite - config for test/functional.
+"""
+
+from unit import titodirpatch  # noqa: F401

test/functional/build_gitannex_tests.py

@@ -20,12 +20,12 @@
 import tempfile
 import sys
 import shutil
-from nose.plugins.skip import SkipTest
 from os.path import join
+from pytest import skip
 
 from functional.fixture import TitoGitTestFixture, tito
 
-from tito.compat import *  # NOQA
+from tito.compat import (getstatusoutput, RawConfigParser)
 from tito.common import run_command
 from tito.builder import GitAnnexBuilder
 
@@ -41,12 +41,9 @@ def setUp(self):
         # Guess based on python version.
         # Do not use anything based on uname in case we are in container.
         # Do not use `lsb_release` to avoid dependencies.
-        if sys.version[0:3] == '2.4':
-            raise SkipTest('git-annex is not available in epel-5')
-
         status, ga_version = getstatusoutput('rpm -q git-annex')
         if status != 0:
-            raise SkipTest("git-annex is missing")
+            skip("git-annex is missing")
 
         # Setup test config:
         self.config = RawConfigParser()
@@ -82,12 +79,12 @@ def test_simple_build(self):
         builder = GitAnnexBuilder(PKG_NAME, None, self.output_dir,
             self.config, {}, {}, **{'offline': True})
         builder.rpm()
-        self.assertEquals(1, len(list(builder.sources)))
+        self.assertEqual(1, len(list(builder.sources)))
 
-        self.assertEquals(2, len(builder.artifacts))
-        self.assertEquals(1, len(glob.glob(join(self.output_dir,
+        self.assertEqual(2, len(builder.artifacts))
+        self.assertEqual(1, len(glob.glob(join(self.output_dir,
             "extsrc-0.0.2-1.*src.rpm"))))
-        self.assertEquals(1, len(glob.glob(join(self.output_dir, 'noarch',
+        self.assertEqual(1, len(glob.glob(join(self.output_dir, 'noarch',
             "extsrc-0.0.2-1.*.noarch.rpm"))))
         builder.cleanup()
 

test/functional/build_tito_tests.py

@@ -25,16 +25,20 @@
 from glob import glob
 from os.path import join
 
+from unit import skip_if_rpmbuild
+
 
 class BuildTitoTests(unittest.TestCase):
 
     @classmethod
     def setUpClass(self):
         'Run tito build before _all_ tests in this class.'
+        skip_if_rpmbuild()
+
         self.output_dir = tempfile.mkdtemp("-titotestoutput")
         os.chdir(os.path.abspath(join(__file__, '..', '..', '..')))
         self.artifacts = tito(
-            'build --rpm --test --output=%s --offline --no-cleanup --debug' %
+            'build --rpm --rpmbuild-options=--without=check --output=%s --offline --no-cleanup --debug' %
             self.output_dir
         )
 

test/functional/fetch_tests.py

@@ -23,10 +23,11 @@
 
 from os.path import join
 
-from tito.common import run_command
-from tito.compat import *  # NOQA
 from functional.fixture import TitoGitTestFixture, tito
-from unit import Capture, is_epel6, is_rawhide
+from unit import Capture, is_epel6, is_rawhide, skip_if_rpmbuild
+
+from tito.common import run_command
+from tito.compat import RawConfigParser
 
 if is_epel6:
     import unittest2 as unittest
@@ -83,14 +84,16 @@ def tearDown(self):
 
     def test_simple_build_no_tag(self):
         # We have not tagged here. Build --rpm should just work:
+        skip_if_rpmbuild()
+
         self.assertFalse(os.path.exists(
             join(self.pkg_dir, '.tito/packages/extsrc')))
 
         tito('build --rpm --output=%s --no-cleanup --debug --arg=source=%s ' %
                 (self.output_dir, self.source_filename))
-        self.assertEquals(1, len(glob.glob(join(self.output_dir,
+        self.assertEqual(1, len(glob.glob(join(self.output_dir,
             "extsrc-0.0.2-1.*src.rpm"))))
-        self.assertEquals(1, len(glob.glob(join(self.output_dir,
+        self.assertEqual(1, len(glob.glob(join(self.output_dir,
             "noarch/extsrc-0.0.2-1.*noarch.rpm"))))
 
     def test_tag_rejected(self):
@@ -113,7 +116,7 @@ def test_with_releaser(self):
         tito('release --debug yum-test --arg source=%s' %
                 self.source_filename)
 
-        self.assertEquals(1, len(glob.glob(join(yum_repo_dir,
+        self.assertEqual(1, len(glob.glob(join(yum_repo_dir,
             "extsrc-0.0.2-1.*noarch.rpm"))))
-        self.assertEquals(1, len(glob.glob(join(yum_repo_dir,
+        self.assertEqual(1, len(glob.glob(join(yum_repo_dir,
             "repodata/repomd.xml"))))

test/functional/multiproject_tests.py

@@ -104,7 +104,7 @@ def test_template_version_tagger(self):
         os.chdir(os.path.join(self.repo_dir, 'pkg3'))
         tito('tag --debug --accept-auto-changelog')
         new_ver = get_latest_tagged_version(TEST_PKG_3)
-        self.assertEquals("0.0.2-1", new_ver)
+        self.assertEqual("0.0.2-1", new_ver)
 
         dest_file = os.path.join(self.repo_dir, 'pkg3', "version.txt")
         self.assertTrue(os.path.exists(dest_file))
@@ -133,24 +133,24 @@ def test_release_tagger_use_release(self):
         os.chdir(os.path.join(self.repo_dir, 'pkg2'))
         tito('tag --debug --accept-auto-changelog --use-release 42')
         new_ver = get_latest_tagged_version(TEST_PKG_2)
-        self.assertEquals(new_ver.split('-')[-1], "42")
+        self.assertEqual(new_ver.split('-')[-1], "42")
 
     def test_release_tagger_use_version(self):
         os.chdir(os.path.join(self.repo_dir, 'pkg2'))
         start_ver = get_latest_tagged_version(TEST_PKG_2)
         tito('tag --debug --accept-auto-changelog --use-version 1.3.37')
         new_ver = get_latest_tagged_version(TEST_PKG_2)
         self.assertFalse(release_bumped(start_ver, new_ver))
-        self.assertEquals(new_ver, "1.3.37-1")
+        self.assertEqual(new_ver, "1.3.37-1")
 
     def test_build_tgz(self):
         os.chdir(os.path.join(self.repo_dir, 'pkg1'))
         artifacts = tito('build --tgz')
-        self.assertEquals(1, len(artifacts))
-        self.assertEquals('%s-0.0.1.tar.gz' % TEST_PKG_1,
+        self.assertEqual(1, len(artifacts))
+        self.assertEqual('%s-0.0.1.tar.gz' % TEST_PKG_1,
                 os.path.basename(artifacts[0]))
 
     def test_build_rpm(self):
         os.chdir(os.path.join(self.repo_dir, 'pkg1'))
         artifacts = tito('build --rpm')
-        self.assertEquals(3, len(artifacts))
+        self.assertEqual(3, len(artifacts))