diff --git a/pscheduler-archiver-esmond/Makefile b/pscheduler-archiver-esmond/Makefile index 4474e6af36..495dd93a63 100644 --- a/pscheduler-archiver-esmond/Makefile +++ b/pscheduler-archiver-esmond/Makefile @@ -7,7 +7,7 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package esmond + nose2 --with-coverage --cover-package esmond diff --git a/pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec b/pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec index 89cb920cfd..cfd5240855 100644 --- a/pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec +++ b/pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec @@ -30,7 +30,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %define directory %{_includedir}/make diff --git a/pscheduler-archiver-http/Makefile b/pscheduler-archiver-http/Makefile index b37959bcfc..cdebc6fc40 100644 --- a/pscheduler-archiver-http/Makefile +++ b/pscheduler-archiver-http/Makefile @@ -7,10 +7,10 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package rabbitmq + nose2 --with-coverage --cover-package rabbitmq clean:: make -C tests $@ diff --git a/pscheduler-archiver-rabbitmq/Makefile b/pscheduler-archiver-rabbitmq/Makefile index b37959bcfc..cdebc6fc40 100644 --- a/pscheduler-archiver-rabbitmq/Makefile +++ b/pscheduler-archiver-rabbitmq/Makefile @@ -7,10 +7,10 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package rabbitmq + nose2 --with-coverage --cover-package rabbitmq clean:: make -C tests $@ diff --git a/pscheduler-archiver-syslog/Makefile b/pscheduler-archiver-syslog/Makefile index b37959bcfc..cdebc6fc40 100644 --- a/pscheduler-archiver-syslog/Makefile +++ b/pscheduler-archiver-syslog/Makefile @@ -7,10 +7,10 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package rabbitmq + nose2 --with-coverage --cover-package rabbitmq clean:: make -C tests $@ diff --git a/pscheduler-archiver-tcp/Makefile b/pscheduler-archiver-tcp/Makefile index c113c22db2..6a05cca5af 100644 --- a/pscheduler-archiver-tcp/Makefile +++ b/pscheduler-archiver-tcp/Makefile @@ -7,10 +7,10 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package tcp + nose2 --with-coverage --cover-package tcp clean:: make -C tests $@ diff --git a/pscheduler-archiver-tcp/tcp/unibuild-packaging/rpm/pscheduler-archiver-tcp.spec b/pscheduler-archiver-tcp/tcp/unibuild-packaging/rpm/pscheduler-archiver-tcp.spec index 9c36fbd46f..b7a9811a1e 100644 --- a/pscheduler-archiver-tcp/tcp/unibuild-packaging/rpm/pscheduler-archiver-tcp.spec +++ b/pscheduler-archiver-tcp/tcp/unibuild-packaging/rpm/pscheduler-archiver-tcp.spec @@ -26,7 +26,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %define directory %{_includedir}/make diff --git a/pscheduler-archiver-udp/Makefile b/pscheduler-archiver-udp/Makefile index b37959bcfc..cdebc6fc40 100644 --- a/pscheduler-archiver-udp/Makefile +++ b/pscheduler-archiver-udp/Makefile @@ -7,10 +7,10 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package rabbitmq + nose2 --with-coverage --cover-package rabbitmq clean:: make -C tests $@ diff --git a/pscheduler-archiver-udp/udp/unibuild-packaging/rpm/pscheduler-archiver-udp.spec b/pscheduler-archiver-udp/udp/unibuild-packaging/rpm/pscheduler-archiver-udp.spec index 1d7a6407a2..c710abee09 100644 --- a/pscheduler-archiver-udp/udp/unibuild-packaging/rpm/pscheduler-archiver-udp.spec +++ b/pscheduler-archiver-udp/udp/unibuild-packaging/rpm/pscheduler-archiver-udp.spec @@ -26,7 +26,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python} -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %define directory %{_includedir}/make diff --git a/pscheduler-test-latency/Makefile b/pscheduler-test-latency/Makefile index 8ffd2f9a1c..ebfb6dee0d 100644 --- a/pscheduler-test-latency/Makefile +++ b/pscheduler-test-latency/Makefile @@ -7,7 +7,7 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package latency + nose2 --with-coverage --cover-package latency diff --git a/pscheduler-test-latency/latency/unibuild-packaging/rpm/pscheduler-test-latency.spec b/pscheduler-test-latency/latency/unibuild-packaging/rpm/pscheduler-test-latency.spec index 9b90181639..ef58b81599 100644 --- a/pscheduler-test-latency/latency/unibuild-packaging/rpm/pscheduler-test-latency.spec +++ b/pscheduler-test-latency/latency/unibuild-packaging/rpm/pscheduler-test-latency.spec @@ -26,7 +26,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %description Latency test class for pScheduler diff --git a/pscheduler-test-latencybg/Makefile b/pscheduler-test-latencybg/Makefile index 8ffd2f9a1c..ebfb6dee0d 100644 --- a/pscheduler-test-latencybg/Makefile +++ b/pscheduler-test-latencybg/Makefile @@ -7,7 +7,7 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package latency + nose2 --with-coverage --cover-package latency diff --git a/pscheduler-test-latencybg/latencybg/unibuild-packaging/rpm/pscheduler-test-latencybg.spec b/pscheduler-test-latencybg/latencybg/unibuild-packaging/rpm/pscheduler-test-latencybg.spec index 85b59b7bc9..3279e34bb7 100644 --- a/pscheduler-test-latencybg/latencybg/unibuild-packaging/rpm/pscheduler-test-latencybg.spec +++ b/pscheduler-test-latencybg/latencybg/unibuild-packaging/rpm/pscheduler-test-latencybg.spec @@ -26,7 +26,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %description Latency test class for pScheduler that runs in the background. diff --git a/pscheduler-test-rtt/Makefile b/pscheduler-test-rtt/Makefile index dfc73438a9..242502f31a 100644 --- a/pscheduler-test-rtt/Makefile +++ b/pscheduler-test-rtt/Makefile @@ -7,7 +7,7 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package rtt + nose2 --with-coverage --cover-package rtt diff --git a/pscheduler-test-rtt/rtt/unibuild-packaging/rpm/pscheduler-test-rtt.spec b/pscheduler-test-rtt/rtt/unibuild-packaging/rpm/pscheduler-test-rtt.spec index 3deeb4f285..0834d11a2d 100644 --- a/pscheduler-test-rtt/rtt/unibuild-packaging/rpm/pscheduler-test-rtt.spec +++ b/pscheduler-test-rtt/rtt/unibuild-packaging/rpm/pscheduler-test-rtt.spec @@ -26,7 +26,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %description Round trip time test class for pScheduler diff --git a/pscheduler-test-throughput/Makefile b/pscheduler-test-throughput/Makefile index 43aaa7c1fa..64b7998e1b 100644 --- a/pscheduler-test-throughput/Makefile +++ b/pscheduler-test-throughput/Makefile @@ -7,7 +7,7 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package throughput + nose2 --with-coverage --cover-package throughput diff --git a/pscheduler-test-throughput/throughput/unibuild-packaging/rpm/pscheduler-test-throughput.spec b/pscheduler-test-throughput/throughput/unibuild-packaging/rpm/pscheduler-test-throughput.spec index 0263b32eee..b54dd8db42 100644 --- a/pscheduler-test-throughput/throughput/unibuild-packaging/rpm/pscheduler-test-throughput.spec +++ b/pscheduler-test-throughput/throughput/unibuild-packaging/rpm/pscheduler-test-throughput.spec @@ -26,7 +26,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %description Throughput test class for pScheduler diff --git a/pscheduler-test-trace/Makefile b/pscheduler-test-trace/Makefile index 797427eee6..5b3d398225 100644 --- a/pscheduler-test-trace/Makefile +++ b/pscheduler-test-trace/Makefile @@ -7,7 +7,7 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package trace + nose2 --with-coverage --cover-package trace diff --git a/pscheduler-test-trace/trace/unibuild-packaging/rpm/pscheduler-test-trace.spec b/pscheduler-test-trace/trace/unibuild-packaging/rpm/pscheduler-test-trace.spec index 0994e94205..49201fdc4d 100644 --- a/pscheduler-test-trace/trace/unibuild-packaging/rpm/pscheduler-test-trace.spec +++ b/pscheduler-test-trace/trace/unibuild-packaging/rpm/pscheduler-test-trace.spec @@ -26,7 +26,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %description Simplestream test class for pScheduler diff --git a/pscheduler-tool-owping/Makefile b/pscheduler-tool-owping/Makefile index b0c5cbf32a..cdb7ff9729 100644 --- a/pscheduler-tool-owping/Makefile +++ b/pscheduler-tool-owping/Makefile @@ -7,7 +7,7 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package owping + nose2 --with-coverage --cover-package owping diff --git a/pscheduler-tool-owping/owping/unibuild-packaging/rpm/pscheduler-tool-owping.spec b/pscheduler-tool-owping/owping/unibuild-packaging/rpm/pscheduler-tool-owping.spec index f814760739..f6bf1dad1c 100644 --- a/pscheduler-tool-owping/owping/unibuild-packaging/rpm/pscheduler-tool-owping.spec +++ b/pscheduler-tool-owping/owping/unibuild-packaging/rpm/pscheduler-tool-owping.spec @@ -29,7 +29,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %description owping tool class for pScheduler diff --git a/pscheduler-tool-powstream/Makefile b/pscheduler-tool-powstream/Makefile index 72293f1fb5..9baafa40ed 100644 --- a/pscheduler-tool-powstream/Makefile +++ b/pscheduler-tool-powstream/Makefile @@ -7,7 +7,7 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package powstream + nose2 --with-coverage --cover-package powstream diff --git a/pscheduler-tool-powstream/powstream/unibuild-packaging/rpm/pscheduler-tool-powstream.spec b/pscheduler-tool-powstream/powstream/unibuild-packaging/rpm/pscheduler-tool-powstream.spec index c98e0c53fd..2cf2a8c632 100644 --- a/pscheduler-tool-powstream/powstream/unibuild-packaging/rpm/pscheduler-tool-powstream.spec +++ b/pscheduler-tool-powstream/powstream/unibuild-packaging/rpm/pscheduler-tool-powstream.spec @@ -31,7 +31,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %description powstream tool class for pScheduler diff --git a/pscheduler-tool-twping/Makefile b/pscheduler-tool-twping/Makefile index ba7bae2ec4..521d708dc3 100644 --- a/pscheduler-tool-twping/Makefile +++ b/pscheduler-tool-twping/Makefile @@ -7,7 +7,7 @@ AUTO_TARBALL := 1 include unibuild/unibuild.make test:: - nosetests + nose2 test-coverage:: - nosetests --with-coverage --cover-package twping + nose2 --with-coverage --cover-package twping diff --git a/pscheduler-tool-twping/twping/unibuild-packaging/rpm/pscheduler-tool-twping.spec b/pscheduler-tool-twping/twping/unibuild-packaging/rpm/pscheduler-tool-twping.spec index c9f60d4848..b3c4b1c73e 100644 --- a/pscheduler-tool-twping/twping/unibuild-packaging/rpm/pscheduler-tool-twping.spec +++ b/pscheduler-tool-twping/twping/unibuild-packaging/rpm/pscheduler-tool-twping.spec @@ -28,7 +28,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python}-pscheduler -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 %description twping tool class for pScheduler diff --git a/python-nose/Makefile b/python-nose/Makefile deleted file mode 100644 index 25bcfb5e7d..0000000000 --- a/python-nose/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# -# Makefile for Any Package -# - -include unibuild/unibuild.make diff --git a/python-nose/nose-1.3.7.tar.gz b/python-nose/nose-1.3.7.tar.gz deleted file mode 100644 index a70b971c70..0000000000 Binary files a/python-nose/nose-1.3.7.tar.gz and /dev/null differ diff --git a/python-nose/unibuild-packaging/rpm/python-nose-coverage4.patch b/python-nose/unibuild-packaging/rpm/python-nose-coverage4.patch deleted file mode 100644 index 94d3f3cb33..0000000000 --- a/python-nose/unibuild-packaging/rpm/python-nose-coverage4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up nose-1.3.7/nose/plugins/cover.py.coverage4 nose-1.3.7/nose/plugins/cover.py ---- nose-1.3.7/nose/plugins/cover.py.coverage4 2015-04-04 03:28:20.000000000 -0600 -+++ nose-1.3.7/nose/plugins/cover.py 2016-11-09 16:16:32.832927855 -0700 -@@ -187,7 +187,7 @@ class Coverage(Plugin): - for name, module in sys.modules.items() - if self.wantModuleCoverage(name, module)] - log.debug("Coverage report will cover modules: %s", modules) -- self.coverInstance.report(modules, file=stream) -+ self.coverInstance.report(modules, file=stream, show_missing=True) - - import coverage - if self.coverHtmlDir: -@@ -207,7 +207,7 @@ class Coverage(Plugin): - # make sure we have minimum required coverage - if self.coverMinPercentage: - f = StringIO.StringIO() -- self.coverInstance.report(modules, file=f) -+ self.coverInstance.report(modules, file=f, show_missing=True) - - multiPackageRe = (r'-------\s\w+\s+\d+\s+\d+(?:\s+\d+\s+\d+)?' - r'\s+(\d+)%\s+\d*\s{0,1}$') diff --git a/python-nose/unibuild-packaging/rpm/python-nose-py35.patch b/python-nose/unibuild-packaging/rpm/python-nose-py35.patch deleted file mode 100644 index 604f60eaba..0000000000 --- a/python-nose/unibuild-packaging/rpm/python-nose-py35.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up nose-1.3.7/functional_tests/test_load_tests_from_test_case.py.py35 nose-1.3.7/functional_tests/test_load_tests_from_test_case.py ---- nose-1.3.7/functional_tests/test_load_tests_from_test_case.py.py35 2012-09-29 02:18:54.000000000 -0600 -+++ nose-1.3.7/functional_tests/test_load_tests_from_test_case.py 2016-11-15 13:42:27.946707472 -0700 -@@ -29,6 +29,7 @@ class NoFixturePlug(Plugin): - pass - def tearDown(self): - pass -+ Derived.__qualname__ = Derived.__name__ - # must use nose loader here because the default loader in 2.3 - # won't load tests from base classes - l = loader.TestLoader() -diff -up nose-1.3.7/nose/util.py.py35 nose-1.3.7/nose/util.py ---- nose-1.3.7/nose/util.py.py35 2015-04-04 02:52:52.000000000 -0600 -+++ nose-1.3.7/nose/util.py 2016-11-15 13:42:27.946707472 -0700 -@@ -643,6 +643,7 @@ def transplant_class(cls, module): - pass - C.__module__ = module - C.__name__ = cls.__name__ -+ C.__qualname__ = cls.__name__ - return C - - -diff -up nose-1.3.7/unit_tests/test_xunit.py.py35 nose-1.3.7/unit_tests/test_xunit.py ---- nose-1.3.7/unit_tests/test_xunit.py.py35 2015-04-04 02:52:52.000000000 -0600 -+++ nose-1.3.7/unit_tests/test_xunit.py 2016-11-15 13:42:27.946707472 -0700 -@@ -16,6 +16,7 @@ def mktest(): - class TC(unittest.TestCase): - def runTest(self): - pass -+ TC.__qualname__ = TC.__name__ - test = TC() - return test - diff --git a/python-nose/unibuild-packaging/rpm/python-nose-py36.patch b/python-nose/unibuild-packaging/rpm/python-nose-py36.patch deleted file mode 100644 index 75a47c0841..0000000000 --- a/python-nose/unibuild-packaging/rpm/python-nose-py36.patch +++ /dev/null @@ -1,69 +0,0 @@ -From acf7c4e073030a69712172b133076101e2b7d81f Mon Sep 17 00:00:00 2001 -From: Tomas Orsava -Date: Mon, 12 Dec 2016 12:09:47 +0100 -Subject: [PATCH] Patch for compatibility with Python 3.6 - -Python 3.6 returns a ModuleNotFoundError instead of the previous ImportError. ---- - functional_tests/test_loader.py | 2 +- - functional_tests/test_withid_failures.rst | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/functional_tests/test_loader.py b/functional_tests/test_loader.py -index 81aaa7b..3f82122 100644 ---- a/functional_tests/test_loader.py -+++ b/functional_tests/test_loader.py -@@ -369,7 +369,7 @@ class TestNoseTestLoader(unittest.TestCase): - assert res.errors, "Expected errors but got none" - assert not res.failures, res.failures - err = res.errors[0][0].test.exc_class -- assert err is ImportError, \ -+ assert issubclass(err, ImportError), \ - "Expected import error, got %s" % err - - def test_load_nonsense_name(self): -diff --git a/functional_tests/test_withid_failures.rst b/functional_tests/test_withid_failures.rst -index cf09d4f..cb20886 100644 ---- a/functional_tests/test_withid_failures.rst -+++ b/functional_tests/test_withid_failures.rst -@@ -7,16 +7,16 @@ - >>> support = os.path.join(os.path.dirname(__file__), 'support', 'id_fails') - >>> argv = [__file__, '-v', '--with-id', '--id-file', idfile, support] - >>> run(argv=argv, plugins=[TestId()]) # doctest: +ELLIPSIS -- #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR -+ #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR - #2 test_b.test ... ok - #3 test_b.test_fail ... FAIL - - ====================================================================== -- ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...) -+ ERROR: Failure: ... (No module ...apackagethatdoesntexist...) - ---------------------------------------------------------------------- - Traceback (most recent call last): - ... -- ImportError: No module ...apackagethatdoesntexist... -+ ...: No module ...apackagethatdoesntexist... - - ====================================================================== - FAIL: test_b.test_fail -@@ -35,14 +35,14 @@ Addressing failures works (sometimes). - >>> argv.append('1') - >>> _junk = sys.modules.pop('test_a', None) # 2.3 requires - >>> run(argv=argv, plugins=[TestId()]) #doctest: +ELLIPSIS -- #1 Failure: ImportError (No module ...apackagethatdoesntexist...) ... ERROR -+ #1 Failure: ... (No module ...apackagethatdoesntexist...) ... ERROR - - ====================================================================== -- ERROR: Failure: ImportError (No module ...apackagethatdoesntexist...) -+ ERROR: Failure: ... (No module ...apackagethatdoesntexist...) - ---------------------------------------------------------------------- - Traceback (most recent call last): - ... -- ImportError: No module ...apackagethatdoesntexist... -+ ...: No module ...apackagethatdoesntexist... - - ---------------------------------------------------------------------- - Ran 1 test in ...s --- -2.11.0 - diff --git a/python-nose/unibuild-packaging/rpm/python-nose-readunicode.patch b/python-nose/unibuild-packaging/rpm/python-nose-readunicode.patch deleted file mode 100644 index 61d4cd23d8..0000000000 --- a/python-nose/unibuild-packaging/rpm/python-nose-readunicode.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up nose-1.3.7/nose/plugins/doctests.py.readunicode nose-1.3.7/nose/plugins/doctests.py ---- nose-1.3.7/nose/plugins/doctests.py.readunicode 2015-04-04 02:52:52.000000000 -0600 -+++ nose-1.3.7/nose/plugins/doctests.py 2016-11-15 14:24:54.298239018 -0700 -@@ -49,6 +49,7 @@ test. - """ - from __future__ import generators - -+import codecs - import logging - import os - import sys -@@ -259,7 +260,7 @@ class Doctest(Plugin): - """ - if self.extension and anyp(filename.endswith, self.extension): - name = os.path.basename(filename) -- dh = open(filename) -+ dh = codecs.open(filename, encoding='utf-8') - try: - doc = dh.read() - finally: diff --git a/python-nose/unibuild-packaging/rpm/python-nose-unicode.patch b/python-nose/unibuild-packaging/rpm/python-nose-unicode.patch deleted file mode 100644 index a103da8bc3..0000000000 --- a/python-nose/unibuild-packaging/rpm/python-nose-unicode.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -up nose-1.3.7/AUTHORS.unicode nose-1.3.7/AUTHORS -diff -up nose-1.3.7/CHANGELOG.unicode nose-1.3.7/CHANGELOG -diff -up nose-1.3.7/nose/plugins/capture.py.unicode nose-1.3.7/nose/plugins/capture.py ---- nose-1.3.7/nose/plugins/capture.py.unicode 2015-04-04 02:52:52.000000000 -0600 -+++ nose-1.3.7/nose/plugins/capture.py 2016-11-15 13:58:18.713025335 -0700 -@@ -12,6 +12,7 @@ the options ``-s`` or ``--nocapture``. - import logging - import os - import sys -+import traceback - from nose.plugins.base import Plugin - from nose.pyversion import exc_to_unicode, force_unicode - from nose.util import ln -@@ -71,26 +72,56 @@ class Capture(Plugin): - def formatError(self, test, err): - """Add captured output to error report. - """ -- test.capturedOutput = output = self.buffer -+ test.capturedOutput = output = '' -+ output_exc_info = None -+ try: -+ test.capturedOutput = output = self.buffer -+ except UnicodeError: -+ # python2's StringIO.StringIO [1] class has this warning: -+ # -+ # The StringIO object can accept either Unicode or 8-bit strings, -+ # but mixing the two may take some care. If both are used, 8-bit -+ # strings that cannot be interpreted as 7-bit ASCII (that use the -+ # 8th bit) will cause a UnicodeError to be raised when getvalue() -+ # is called. -+ # -+ # This exception handler is a protection against issue #816 [2]. -+ # Capturing the exception info allows us to display it back to the -+ # user. -+ # -+ # [1] -+ # [2] -+ output_exc_info = sys.exc_info() - self._buf = None -- if not output: -+ if (not output) and (not output_exc_info): - # Don't return None as that will prevent other - # formatters from formatting and remove earlier formatters - # formats, instead return the err we got - return err - ec, ev, tb = err -- return (ec, self.addCaptureToErr(ev, output), tb) -+ return (ec, self.addCaptureToErr(ev, output, output_exc_info=output_exc_info), tb) - - def formatFailure(self, test, err): - """Add captured output to failure report. - """ - return self.formatError(test, err) - -- def addCaptureToErr(self, ev, output): -+ def addCaptureToErr(self, ev, output, output_exc_info=None): -+ # If given, output_exc_info should be a 3-tuple from sys.exc_info(), -+ # from an exception raised while trying to get the captured output. - ev = exc_to_unicode(ev) - output = force_unicode(output) -- return u'\n'.join([ev, ln(u'>> begin captured stdout <<'), -- output, ln(u'>> end captured stdout <<')]) -+ error_text = [ev, ln(u'>> begin captured stdout <<'), -+ output, ln(u'>> end captured stdout <<')] -+ if output_exc_info: -+ error_text.extend([u'OUTPUT ERROR: Could not get captured output.', -+ # -+ # -+ u"The test might've printed both 'unicode' strings and non-ASCII 8-bit 'str' strings.", -+ ln(u'>> begin captured stdout exception traceback <<'), -+ u''.join(traceback.format_exception(*output_exc_info)), -+ ln(u'>> end captured stdout exception traceback <<')]) -+ return u'\n'.join(error_text) - - def start(self): - self.stdout.append(sys.stdout) -diff -up nose-1.3.7/unit_tests/test_capture_plugin.py.unicode nose-1.3.7/unit_tests/test_capture_plugin.py ---- nose-1.3.7/unit_tests/test_capture_plugin.py.unicode 2012-09-29 02:18:54.000000000 -0600 -+++ nose-1.3.7/unit_tests/test_capture_plugin.py 2016-11-15 13:58:18.714025330 -0700 -@@ -4,6 +4,12 @@ import unittest - from optparse import OptionParser - from nose.config import Config - from nose.plugins.capture import Capture -+from nose.pyversion import force_unicode -+ -+if sys.version_info[0] == 2: -+ py2 = True -+else: -+ py2 = False - - class TestCapturePlugin(unittest.TestCase): - -@@ -62,6 +68,35 @@ class TestCapturePlugin(unittest.TestCas - c.end() - self.assertEqual(c.buffer, "test 日本\n") - -+ def test_does_not_crash_with_mixed_unicode_and_nonascii_str(self): -+ class Dummy: -+ pass -+ d = Dummy() -+ c = Capture() -+ c.start() -+ printed_nonascii_str = force_unicode("test 日本").encode('utf-8') -+ printed_unicode = force_unicode("Hello") -+ print printed_nonascii_str -+ print printed_unicode -+ try: -+ raise Exception("boom") -+ except: -+ err = sys.exc_info() -+ formatted = c.formatError(d, err) -+ _, fev, _ = formatted -+ -+ if py2: -+ for string in [force_unicode(printed_nonascii_str, encoding='utf-8'), printed_unicode]: -+ assert string not in fev, "Output unexpectedly found in error message" -+ assert d.capturedOutput == '', "capturedOutput unexpectedly non-empty" -+ assert "OUTPUT ERROR" in fev -+ assert "captured stdout exception traceback" in fev -+ assert "UnicodeDecodeError" in fev -+ else: -+ for string in [repr(printed_nonascii_str), printed_unicode]: -+ assert string in fev, "Output not found in error message" -+ assert string in d.capturedOutput, "Output not attached to test" -+ - def test_format_error(self): - class Dummy: - pass diff --git a/python-nose/unibuild-packaging/rpm/python-nose.spec b/python-nose/unibuild-packaging/rpm/python-nose.spec deleted file mode 100644 index 8379798872..0000000000 --- a/python-nose/unibuild-packaging/rpm/python-nose.spec +++ /dev/null @@ -1,372 +0,0 @@ -%global modname nose - -# Enable building without docs to avoid a circular dependency between this and python-sphinx -%bcond_with docs - -%global desc nose extends the test loading and running features of unit test, making\ -it easier to write, find and run tests.\ -\ -By default, nose will run tests in files or directories under the\ -current working directory whose names include "test" or "Test" at a\ -word boundary (like "test_this" or "functional_test" or "TestClass"\ -but not "libtest"). Test output is similar to that of unit test, but\ -also includes captured stdout output from failing tests, for easy\ -print-style debugging.\ -\ -These features, and many more, are customizable through the use of\ -plugins. Plugins included with nose provide support for doctest, code\ -coverage and profiling, flexible attribute-based test selection,\ -output capture and more.\ - - -Name: %{_pscheduler_python}-%{modname} -Version: 1.3.7 -Release: 23%{?dist} -BuildArch: noarch - -License: LGPLv2+ and Public Domain -Summary: Discovery-based unit test extension for Python -URL: https://nose.readthedocs.org/en/latest/ -Source0: nose-%{version}.tar.gz -# Make compatible with coverage 4.1 -# https://github.com/nose-devs/nose/pull/1004 -Patch0: python-nose-coverage4.patch -# Fix python 3.5 compat -# https://github.com/nose-devs/nose/pull/983 -Patch1: python-nose-py35.patch -# Fix UnicodeDecodeError with captured output -# https://github.com/nose-devs/nose/pull/988 -Patch2: python-nose-unicode.patch -# Allow docutils to read utf-8 source -Patch3: python-nose-readunicode.patch -# Fix Python 3.6 compatibility -# Python now returns ModuleNotFoundError instead of the previous ImportError -# https://github.com/nose-devs/nose/pull/1029 -Patch4: python-nose-py36.patch - -BuildRequires: dos2unix - -%description -%{desc} - -%package docs -Summary: Nose Documentation -%if %{with docs} -BuildRequires: %{_bindir}/sphinx-build -%endif - -%description docs -Documentation for Nose. - -%package -n python3-%{modname} -Summary: %{summary} -BuildRequires: %{_pscheduler_python}3-devel -BuildRequires: %{_pscheduler_python}3-setuptools -BuildRequires: %{_pscheduler_python}3-coverage >= 3.4-1 -Requires: %{_pscheduler_python}3-setuptools - -%{?python_provide:%python_provide python3-%{modname}} -Obsoletes: platform-python-%{modname} < %{version}-%{release} - -%description -n python3-%{modname} -%{desc} - -This package installs the nose module and nosetests3 program that can discover -python3 unit tests. - -%prep -%setup -qc -pushd %{modname}-%{version} -%autopatch -p1 -dos2unix examples/attrib_plugin.py -cp -pr lgpl.txt AUTHORS CHANGELOG examples NEWS README.txt .. -popd -mv %{modname}-%{version} python3 - -%build -pushd python3 -%py3_build -popd - -%install -mkdir -p %{buildroot}%{_mandir}/man1 -pushd python3 -%py3_install -mv %{buildroot}%{_bindir}/nosetests{,-%{python3_version}} -ln -sf nosetests-%{python3_version} %{buildroot}%{_bindir}/nosetests-3 -mv %{buildroot}%{_prefix}/man/man1/nosetests.1 %{buildroot}%{_mandir}/man1/nosetests-%{python3_version}.1 -ln -sf nosetests-%{python3_version}.1 %{buildroot}%{_mandir}/man1/nosetests-3.1 -popd - -ln -sf nosetests-2 %{buildroot}%{_bindir}/nosetests -ln -sf nosetests-2.1 %{buildroot}%{_mandir}/man1/nosetests.1 - -%if %{with docs} -pushd python2/doc - sphinx-build -b html -d .build/doctrees . .build/html - rm -vrf .build/html/.buildinfo .build/html/_sources - mv .build/html ../.. - rm -vrf .build -popd -%endif -cp -a python3/doc reST -rm -vrf reST/{.static,.templates} - -%check -pushd python3 -%{__python3} setup.py build_tests -%{__python3} selftest.py -popd - -%files -n python3-%{modname} -%license lgpl.txt -%exclude %{_bindir}/nosetests-3 -%{_bindir}/* -%exclude %{_mandir}/man1/nosetests-3.1* -%{_mandir}/man1/* -%{python3_sitelib}/nose-*.egg-info/ -%{python3_sitelib}/nose/ - -%files docs -%license lgpl.txt -%doc AUTHORS CHANGELOG examples NEWS README.txt reST -%if %{with docs} -%doc html -%endif - -%changelog -* Wed Nov 28 2018 Lumír Balhar - 1.3.7-23 -- Require platform-python-setuptools instead of python3-setuptools -- Resolves: rhbz#1654302 - -* Mon Aug 06 2018 Petr Viktorin - 1.3.7-22 -- Remove unversioned executables (only *-3.6 should be provided) - -* Mon Jul 09 2018 Petr Viktorin - 1.3.7-21 -- Remove dependency on python2-coverage - https://bugzilla.redhat.com/show_bug.cgi?id=1595193 - -* Mon Jun 25 2018 Petr Viktorin - 1.3.7-20 -- Allow Python 2 for build - see https://hurl.corp.redhat.com/rhel8-py2 -- Build without docs to fix FTBFS - -* Fri Feb 09 2018 Fedora Release Engineering - 1.3.7-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Nov 07 2017 Igor Gnatenko - 1.3.7-18 -- Use better Obsoletes for platform-python - -* Sat Nov 04 2017 Igor Gnatenko - 1.3.7-17 -- Remove platform-python subpackage -- Cleanup spec - -* Fri Sep 29 2017 Troy Dawson - 1.3.7-16 -- Cleanup spec file conditionals - -* Thu Aug 10 2017 Miro Hrončok - 1.3.7-15 -- Add platform-python subpackage - -* Thu Jul 27 2017 Fedora Release Engineering - 1.3.7-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.3.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 12 2016 Tomas Orsava - 1.3.7-12 -- Patched to fix compatibility with Python 3.6 - -* Mon Dec 05 2016 Randy Barlow - 1.3.7-11 -- Provide nosetests-3 (#1289820). -- Rename python-nose to python2-nose and use Python provides macro. -- Include the license with the -docs subpackage. -- Use symlinks to provide man pages for all the Python version variants of /usr/bin/nosetests. -- The -docs subpackage no longer requires python-nose since that doesn't make sense. - -* Tue Nov 15 2016 Orion Poplawski 1.3.7-10 -- Add upstream patch to fix python 3.5 compat -- Add patch to allow docutils to read unicode source -- Update spec - -* Wed Nov 9 2016 Orion Poplawski 1.3.7-9 -- Add patch to fix build with coverage 4.1 - -* Tue Jul 19 2016 Fedora Release Engineering - 1.3.7-8 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Tue Feb 2 2016 Orion Poplawski 1.3.7-7 -- Fix URL - -* Thu Sep 24 2015 Robert Kuska 1.3.7-6 -- Rebuilt for Python3.5 rebuild with disabled tests under python3 - -* Sun Aug 09 2015 Kevin Fenzi 1.3.7-5 -- Add conditional for python-sphinx buildrequires when with_docs is not set. -- Fixes bug #1251700 - -* Fri Jul 24 2015 Kevin Fenzi 1.3.7-4 -- Version provides correctly for python2-nose. - -* Fri Jul 17 2015 Kevin Fenzi 1.3.7-3 -- Add provides for python2-nose. Fixes bug #1241670 - -* Thu Jun 18 2015 Fedora Release Engineering - 1.3.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jun 03 2015 Kevin Fenzi 1.3.7-1 -- Update to 1.3.7 (#1227345) - -* Sat Apr 04 2015 Ralph Bean - 1.3.6-1 -- new version - -* Wed Aug 27 2014 Luke Macken - 1.3.4-1 -- Update to 1.3.4 (#1094718) - -* Sat Jun 07 2014 Fedora Release Engineering - 1.3.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 19 2014 Bohuslav Kabrda - 1.3.2-2 -- Add patch for issue https://github.com/nose-devs/nose/pull/811, -which makes tests of python-billiard and python-falcon fail with Python 3.4 - -* Sat May 03 2014 Orion Poplawski - 1.3.2-1 -- Update to 1.3.2 for Python 3.4 suport - -* Fri May 02 2014 Orion Poplawski - 1.3.1-2 -- Rebuild for Python 3.4 - -* Fri Mar 14 2014 Luke Macken - 1.3.1-1 -- Update to 1.3.1 (#1074971) - -* Sun Aug 04 2013 Fedora Release Engineering - 1.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Apr 9 2013 Toshio Kuratomi - 1.3.0-1 -- Update to 1.3.0 upstream with python-3.3 fixes - -* Thu Feb 14 2013 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Sep 12 2012 Toshio Kuratomi - 1.2.1-1 -- New upsream 1.2.1 that just bumps the version properly - -* Mon Sep 10 2012 Toshio Kuratomi - 1.2.0-1 -- Update to nose-1.2.0. -- Two less python3 test failures than 1.1.2 - -* Sat Aug 4 2012 David Malcolm - 1.1.2-5 -- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 -- disable selftests that fail under 3.3 - -* Fri Aug 3 2012 David Malcolm - 1.1.2-4 -- remove rhel logic from with_python3 conditional - -* Sat Jul 21 2012 Fedora Release Engineering - 1.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 1.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Aug 1 2011 Toshio Kuratomi - 1.1.2-1 -- Upstream bugfix release - -* Wed Jul 27 2011 Toshio Kuratomi - 1.1.1-1 -- Upstream bugfix release - -* Tue Feb 08 2011 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Dec 26 2010 Toshio Kuratomi - 1.0.0-1 -- Update to 1.0.0 -- Create the docs subpackage for text docs even if we don't create the html docs. -- Make python3 subpackage - -* Tue Dec 7 2010 Toshio Kuratomi - 0.11.4-2 -- Fix FTBFS with newer coverage - -* Thu Oct 21 2010 Luke Macken - 0.11.4-1 -- Update to 0.11.4 (#3630722) - -* Wed Jul 21 2010 David Malcolm - 0.11.3-5 -- add support for building without docs, to avoid a circular build-time -dependency between this and python-sphinx; disable docs subpackage for now -- add (apparently) missing BR on python-coverage (appears to be needed -for %%check) -- cherrypick upstream compatibility fixes for 2.7 - -* Wed Jul 21 2010 David Malcolm - 0.11.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Thu May 20 2010 Luke Macken - 0.11.3-3 -- Update URL to http://code.google.com/p/python-nose/ -- Align description to reflect that in setup.py -- Create a docs subpackage containing HTML & reST documentation -- Thanks to Gareth Armstrong at HP for the patch - -* Thu May 06 2010 Luke Macken - 0.11.3-2 -- Don't hardcode the python version - -* Thu May 06 2010 Luke Macken - 0.11.3-1 -- Update to 0.11.3 -- Enable the self tests - -* Mon Oct 05 2009 Luke Macken - 0.11.1-2 -- Include the new nosetests-2.6 script as well - -* Mon Oct 05 2009 Luke Macken - 0.11.1-1 -- Update to 0.11.1 - -* Sun Jul 26 2009 Fedora Release Engineering - 0.10.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0.10.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.10.4-1 -- Update to 0.10.4 to fix 2.6 issues - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.10.3-2 -- Rebuild for Python 2.6 - -* Sat Aug 02 2008 Luke Macken 0.10.3-1 -- Update to 0.10.3 - -* Thu Feb 28 2008 Luke Macken 0.10.1-1 -- Update to 0.10.1 - -* Mon Dec 3 2007 Luke Macken 0.10.0-2 -- Add python-setuptools to Requires (Bug #408491) - -* Tue Nov 27 2007 Luke Macken 0.10.0-1 -- 0.10.0 - -* Sun Sep 2 2007 Luke Macken 0.10.0-0.3.b1 -- Update for python-setuptools changes in rawhide - -* Tue Aug 21 2007 Luke Macken 0.10.0-0.2.b1 -- 0.10.0b1 -- Update license tag to LGPLv2 - -* Wed Jun 20 2007 Luke Macken 0.10.0-0.1.a2 -- 0.10.0a2 - -* Sat Jun 2 2007 Luke Macken 0.9.3-1 -- Latest upstream release -- Remove python-nose-0.9.2-mandir.patch - -* Sat Mar 3 2007 Luke Macken 0.9.2-1 -- Add nosetests(1) manpage, and python-nose-0.9.2-mandir.patch to put it in - the correct location. -- 0.9.2 - -* Sat Dec 9 2006 Luke Macken 0.9.1-2 -- Rebuild for python 2.5 - -* Fri Nov 24 2006 Luke Macken 0.9.1-1 -- 0.9.1 - -* Fri Sep 8 2006 Luke Macken 0.9.0-1 -- 0.9.0 - -* Wed Apr 19 2006 Ignacio Vazquez-Abrams 0.8.7.2-1 -- Initial RPM release diff --git a/python-pscheduler/pscheduler/Makefile b/python-pscheduler/pscheduler/Makefile index 203309d44a..4604bac294 100644 --- a/python-pscheduler/pscheduler/Makefile +++ b/python-pscheduler/pscheduler/Makefile @@ -15,10 +15,10 @@ endif test: file-setup - python3 -m nose + python3 -m nose2 test-coverage: file-setup - python3 -m nose --with-coverage --cover-package rabbitmq + python3 -m nose2 --with-coverage --cover-package rabbitmq build: file-setup test diff --git a/python-pscheduler/pscheduler/dev-requirements.txt b/python-pscheduler/pscheduler/dev-requirements.txt index b0c6407dc3..929ac4af97 100644 --- a/python-pscheduler/pscheduler/dev-requirements.txt +++ b/python-pscheduler/pscheduler/dev-requirements.txt @@ -1,5 +1,5 @@ # extra python packages for testing/etc. -nose +nose2 coverage pylint -e . diff --git a/python-pscheduler/pscheduler/pscheduler/log.py b/python-pscheduler/pscheduler/pscheduler/log.py index 06950ed426..de561e9237 100644 --- a/python-pscheduler/pscheduler/pscheduler/log.py +++ b/python-pscheduler/pscheduler/pscheduler/log.py @@ -424,7 +424,7 @@ def is_forced_debugging(self): log.info("Info") log.warning("Warning") log.error("Error") - log.critical("Crtitical") + log.critical("Critical") os.kill(os.getpid(), signal.SIGUSR1 if (num % 2) != 0 else signal.SIGUSR2) time.sleep(1) diff --git a/python-pscheduler/pscheduler/setup.py b/python-pscheduler/pscheduler/setup.py index 028211eca7..36f0e58dd6 100644 --- a/python-pscheduler/pscheduler/setup.py +++ b/python-pscheduler/pscheduler/setup.py @@ -31,6 +31,6 @@ include_package_data=True, package_data={'pscheduler.limitprocessor': ['*.json']}, - tests_require=['nose'], - test_suite='nose.collector', + tests_require=['nose2'], + test_suite='nose2.collector.collector', ) diff --git a/python-pscheduler/pscheduler/tests/README.md b/python-pscheduler/pscheduler/tests/README.md index 107881592a..7e3af0de69 100644 --- a/python-pscheduler/pscheduler/tests/README.md +++ b/python-pscheduler/pscheduler/tests/README.md @@ -17,36 +17,24 @@ This will: * Install `pscheduler` in "editable" mode. That installs an egg link into the python installation that points to the checked out source code for "live" editing and testing. * Install all of the third-party requirements for `pscheduler`. -* Install a couple of testing and development tools like `pylint` and `nose`. +* Install a couple of testing and development tools like `pylint` and `nose2`. ## Running the tests -The test modules are standard issue python unit tests. They can be run however you please, but `dev-requirements.txt` installs the `nose` test runner. +The test modules are standard issue python unit tests. They can be run however you please, but `dev-requirements.txt` installs the `nose2` test runner. To run the tests: ``` cd python-pscheduler/pscheduler -nosetests tests +nose2 tests ``` The arg `tests` refers to the tests directory that lives in that directory. That command will run all of the unit tests. -To run the tests in a single module: +To run the tests in a single module, enter the `tests` directory and run nose2 with the test of your choice: ``` -nosetests tests/sinumber_test.py -``` - -To run the tests in just one test class: - -``` -nosetests tests/sinumber_test.py:TestSinumber -``` - -To run a single test in a test class: - -``` -nosetests tests/sinumber_test.py:TestSinumber.test_si_range +nose2 tests/sinumber_test ``` The requirements file also installs `coverage`. It can be invoked from `nosetests` to create a coverage report by using the ` --with-coverage` flag. @@ -67,4 +55,4 @@ verbosity=2 nocapture=true ``` -There is a similar `--nologcapture` flag as well. \ No newline at end of file +There is a similar `--nologcapture` flag as well. diff --git a/python-pscheduler/pscheduler/tests/api_test.py b/python-pscheduler/pscheduler/tests/test_api.py similarity index 98% rename from python-pscheduler/pscheduler/tests/api_test.py rename to python-pscheduler/pscheduler/tests/test_api.py index 05aa639048..6e92bb9abf 100644 --- a/python-pscheduler/pscheduler/tests/api_test.py +++ b/python-pscheduler/pscheduler/tests/test_api.py @@ -8,7 +8,7 @@ from pscheduler.api import * -from base_test import PschedTestBase +from test_base import PschedTestBase class TestApi(PschedTestBase): diff --git a/python-pscheduler/pscheduler/tests/base_test.py b/python-pscheduler/pscheduler/tests/test_base.py similarity index 100% rename from python-pscheduler/pscheduler/tests/base_test.py rename to python-pscheduler/pscheduler/tests/test_base.py diff --git a/python-pscheduler/pscheduler/tests/clockstate_test.py b/python-pscheduler/pscheduler/tests/test_clockstate.py similarity index 95% rename from python-pscheduler/pscheduler/tests/clockstate_test.py rename to python-pscheduler/pscheduler/tests/test_clockstate.py index 122ed8d41f..fdb9182973 100644 --- a/python-pscheduler/pscheduler/tests/clockstate_test.py +++ b/python-pscheduler/pscheduler/tests/test_clockstate.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.clockstate import clock_state diff --git a/python-pscheduler/pscheduler/tests/db_test.py b/python-pscheduler/pscheduler/tests/test_db.py similarity index 91% rename from python-pscheduler/pscheduler/tests/db_test.py rename to python-pscheduler/pscheduler/tests/test_db.py index 55ddd07929..62df6becb6 100644 --- a/python-pscheduler/pscheduler/tests/db_test.py +++ b/python-pscheduler/pscheduler/tests/test_db.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase class TestDb(PschedTestBase): diff --git a/python-pscheduler/pscheduler/tests/durationrange_test.py b/python-pscheduler/pscheduler/tests/test_durationrange.py similarity index 96% rename from python-pscheduler/pscheduler/tests/durationrange_test.py rename to python-pscheduler/pscheduler/tests/test_durationrange.py index 681c3b45a9..dcdc84a73b 100644 --- a/python-pscheduler/pscheduler/tests/durationrange_test.py +++ b/python-pscheduler/pscheduler/tests/test_durationrange.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.durationrange import DurationRange diff --git a/python-pscheduler/pscheduler/tests/enummatcher_test.py b/python-pscheduler/pscheduler/tests/test_enummatcher.py similarity index 94% rename from python-pscheduler/pscheduler/tests/enummatcher_test.py rename to python-pscheduler/pscheduler/tests/test_enummatcher.py index 4dd8137787..4bca1b31aa 100644 --- a/python-pscheduler/pscheduler/tests/enummatcher_test.py +++ b/python-pscheduler/pscheduler/tests/test_enummatcher.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.enummatcher import EnumMatcher diff --git a/python-pscheduler/pscheduler/tests/filestring_test.py b/python-pscheduler/pscheduler/tests/test_filestring.py similarity index 96% rename from python-pscheduler/pscheduler/tests/filestring_test.py rename to python-pscheduler/pscheduler/tests/test_filestring.py index 5cb3cc173b..3a2f5a1140 100644 --- a/python-pscheduler/pscheduler/tests/filestring_test.py +++ b/python-pscheduler/pscheduler/tests/test_filestring.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.filestring import string_from_file diff --git a/python-pscheduler/pscheduler/tests/interface_test.py b/python-pscheduler/pscheduler/tests/test_interface.py similarity index 95% rename from python-pscheduler/pscheduler/tests/interface_test.py rename to python-pscheduler/pscheduler/tests/test_interface.py index 5eaf34428d..40f4682363 100644 --- a/python-pscheduler/pscheduler/tests/interface_test.py +++ b/python-pscheduler/pscheduler/tests/test_interface.py @@ -6,7 +6,7 @@ import unittest import socket -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.interface import interface_affinity, source_interface, LocalIPList diff --git a/python-pscheduler/pscheduler/tests/ipaddr_test.py b/python-pscheduler/pscheduler/tests/test_ipaddr.py similarity index 99% rename from python-pscheduler/pscheduler/tests/ipaddr_test.py rename to python-pscheduler/pscheduler/tests/test_ipaddr.py index a76e4ad918..0d5b33ad83 100644 --- a/python-pscheduler/pscheduler/tests/ipaddr_test.py +++ b/python-pscheduler/pscheduler/tests/test_ipaddr.py @@ -6,7 +6,7 @@ import socket import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.ipaddr import is_ip, ip_addr_version diff --git a/python-pscheduler/pscheduler/tests/iso8601_test.py b/python-pscheduler/pscheduler/tests/test_iso8601.py similarity index 98% rename from python-pscheduler/pscheduler/tests/iso8601_test.py rename to python-pscheduler/pscheduler/tests/test_iso8601.py index 8f1ae5abca..6c0b99e838 100644 --- a/python-pscheduler/pscheduler/tests/iso8601_test.py +++ b/python-pscheduler/pscheduler/tests/test_iso8601.py @@ -6,7 +6,7 @@ import datetime import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.iso8601 import ( datetime_as_iso8601, diff --git a/python-pscheduler/pscheduler/tests/jqfilter_test.py b/python-pscheduler/pscheduler/tests/test_jqfilter.py similarity index 97% rename from python-pscheduler/pscheduler/tests/jqfilter_test.py rename to python-pscheduler/pscheduler/tests/test_jqfilter.py index 00b50eadb3..e333b714ca 100644 --- a/python-pscheduler/pscheduler/tests/jqfilter_test.py +++ b/python-pscheduler/pscheduler/tests/test_jqfilter.py @@ -6,7 +6,7 @@ import sys import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.jqfilter import JQFilter diff --git a/python-pscheduler/pscheduler/tests/jsonval_test.py b/python-pscheduler/pscheduler/tests/test_jsonval.py similarity index 99% rename from python-pscheduler/pscheduler/tests/jsonval_test.py rename to python-pscheduler/pscheduler/tests/test_jsonval.py index b3c8c17ad6..72c8891f01 100644 --- a/python-pscheduler/pscheduler/tests/jsonval_test.py +++ b/python-pscheduler/pscheduler/tests/test_jsonval.py @@ -6,7 +6,7 @@ import unittest import sys -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.jsonval import json_validate from pscheduler.jsonval import json_validate_from_standard_template diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_always_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_always.py similarity index 95% rename from python-pscheduler/pscheduler/tests/limitprocessor_identifier_always_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_always.py index df7a40f517..e3a2d19a58 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_always_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_always.py @@ -6,7 +6,7 @@ import datetime import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.identifier.always import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_hint_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_hint.py similarity index 96% rename from python-pscheduler/pscheduler/tests/limitprocessor_identifier_hint_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_hint.py index ea8bceba6e..57dceb26cd 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_hint_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_hint.py @@ -6,7 +6,7 @@ import datetime import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.identifier.hint import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipcidrlist_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipcidrlist.py similarity index 96% rename from python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipcidrlist_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipcidrlist.py index ff7cc49712..842eaf79ce 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipcidrlist_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipcidrlist.py @@ -6,7 +6,7 @@ import datetime import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.identifier.ipcidrlist import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipcidrlisturl_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipcidrlisturl.py similarity index 98% rename from python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipcidrlisturl_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipcidrlisturl.py index 773185b8b4..7c1a45fae8 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipcidrlisturl_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipcidrlisturl.py @@ -7,7 +7,7 @@ import tempfile import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.identifier.ipcidrlisturl import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipcymrubogon_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipcymrubogon.py similarity index 98% rename from python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipcymrubogon_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipcymrubogon.py index 65715febbe..86d3bb091b 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipcymrubogon_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipcymrubogon.py @@ -7,7 +7,7 @@ import tempfile import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.identifier.ipcymrubogon import * from pscheduler.psdns import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipreversedns_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipreversedns.py similarity index 98% rename from python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipreversedns_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipreversedns.py index 3931446e07..6ee231c422 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_ipreversedns_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_ipreversedns.py @@ -7,7 +7,7 @@ import tempfile import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.identifier.ipreversedns import * from pscheduler.psdns import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_jq_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_jq.py similarity index 95% rename from python-pscheduler/pscheduler/tests/limitprocessor_identifier_jq_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_jq.py index 65b8fe9bb0..78bcc2064d 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_jq_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_jq.py @@ -7,7 +7,7 @@ import tempfile import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.identifier.jq import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_localif_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_localif.py similarity index 96% rename from python-pscheduler/pscheduler/tests/limitprocessor_identifier_localif_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_localif.py index eb445f495b..eff4845f88 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_localif_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_localif.py @@ -6,7 +6,7 @@ import unittest import socket -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.identifier.localif import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_localsubnet_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_localsubnet.py similarity index 97% rename from python-pscheduler/pscheduler/tests/limitprocessor_identifier_localsubnet_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_localsubnet.py index f703f1fd22..32311e7251 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_identifier_localsubnet_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_identifier_localsubnet.py @@ -6,7 +6,7 @@ import unittest import netifaces -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.identifier.localsubnet import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_limit_jq_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_jq.py similarity index 97% rename from python-pscheduler/pscheduler/tests/limitprocessor_limit_jq_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_limit_jq.py index db3958340a..fee9e9d84e 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_limit_jq_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_jq.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.limit.jq import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_limit_passfail_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_passfail.py similarity index 96% rename from python-pscheduler/pscheduler/tests/limitprocessor_limit_passfail_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_limit_passfail.py index ca0c342d2e..04a7516934 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_limit_passfail_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_passfail.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.limit.passfail import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_limit_rundaterange_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_rundaterange.py similarity index 98% rename from python-pscheduler/pscheduler/tests/limitprocessor_limit_rundaterange_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_limit_rundaterange.py index 9a57ed9af2..a6af3257ce 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_limit_rundaterange_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_rundaterange.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.limit.rundaterange import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_limit_runschedule_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_runschedule.py similarity index 99% rename from python-pscheduler/pscheduler/tests/limitprocessor_limit_runschedule_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_limit_runschedule.py index c9cf2f06e6..44a700e4f2 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_limit_runschedule_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_runschedule.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.limit.runschedule import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_limit_test_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_test.py similarity index 89% rename from python-pscheduler/pscheduler/tests/limitprocessor_limit_test_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_limit_test.py index e5f2f90719..c306df5bef 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_limit_test_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_test.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.limit.test import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_limit_urlfetch_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_urlfetch.py similarity index 97% rename from python-pscheduler/pscheduler/tests/limitprocessor_limit_urlfetch_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_limit_urlfetch.py index 79ea931148..867a3debaf 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_limit_urlfetch_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_limit_urlfetch.py @@ -6,7 +6,7 @@ import tempfile import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.limit.urlfetch import * diff --git a/python-pscheduler/pscheduler/tests/limitprocessor_limit_testtype_test.py b/python-pscheduler/pscheduler/tests/test_limitprocessor_limittype_test.py similarity index 96% rename from python-pscheduler/pscheduler/tests/limitprocessor_limit_testtype_test.py rename to python-pscheduler/pscheduler/tests/test_limitprocessor_limittype_test.py index 91b65131d4..a8b65b0575 100644 --- a/python-pscheduler/pscheduler/tests/limitprocessor_limit_testtype_test.py +++ b/python-pscheduler/pscheduler/tests/test_limitprocessor_limittype_test.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.limitprocessor.limit.testtype import * diff --git a/python-pscheduler/pscheduler/tests/log_test.py b/python-pscheduler/pscheduler/tests/test_log.py similarity index 93% rename from python-pscheduler/pscheduler/tests/log_test.py rename to python-pscheduler/pscheduler/tests/test_log.py index 6ca893db14..d8446fa6b7 100644 --- a/python-pscheduler/pscheduler/tests/log_test.py +++ b/python-pscheduler/pscheduler/tests/test_log.py @@ -8,7 +8,7 @@ import time import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.log import Log @@ -39,7 +39,7 @@ def test_log(self): log.info("Info") log.warning("Warning") log.error("Error") - log.critical("Crtitical") + log.critical("Critical") os.kill(os.getpid(), signal.SIGUSR1 if (num % 2) != 0 else signal.SIGUSR2) diff --git a/python-pscheduler/pscheduler/tests/numa_test.py b/python-pscheduler/pscheduler/tests/test_numa.py similarity index 94% rename from python-pscheduler/pscheduler/tests/numa_test.py rename to python-pscheduler/pscheduler/tests/test_numa.py index 3c41f4ca09..658fccabb9 100644 --- a/python-pscheduler/pscheduler/tests/numa_test.py +++ b/python-pscheduler/pscheduler/tests/test_numa.py @@ -7,7 +7,7 @@ from pscheduler.numa import * -from base_test import PschedTestBase +from test_base import PschedTestBase class TestNuma(PschedTestBase): diff --git a/python-pscheduler/pscheduler/tests/numeric_test.py b/python-pscheduler/pscheduler/tests/test_numeric.py similarity index 94% rename from python-pscheduler/pscheduler/tests/numeric_test.py rename to python-pscheduler/pscheduler/tests/test_numeric.py index 5289d2f986..c3a75f8f8f 100644 --- a/python-pscheduler/pscheduler/tests/numeric_test.py +++ b/python-pscheduler/pscheduler/tests/test_numeric.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.numeric import HighInteger diff --git a/python-pscheduler/pscheduler/tests/numericrange_test.py b/python-pscheduler/pscheduler/tests/test_numericrange.py similarity index 96% rename from python-pscheduler/pscheduler/tests/numericrange_test.py rename to python-pscheduler/pscheduler/tests/test_numericrange.py index 19ee3d4cda..013970fc86 100644 --- a/python-pscheduler/pscheduler/tests/numericrange_test.py +++ b/python-pscheduler/pscheduler/tests/test_numericrange.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.numericrange import NumericRange diff --git a/python-pscheduler/pscheduler/tests/ping_test.py b/python-pscheduler/pscheduler/tests/test_ping.py similarity index 99% rename from python-pscheduler/pscheduler/tests/ping_test.py rename to python-pscheduler/pscheduler/tests/test_ping.py index 457f99241f..3b5fa4aa29 100644 --- a/python-pscheduler/pscheduler/tests/ping_test.py +++ b/python-pscheduler/pscheduler/tests/test_ping.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.ping import parse_ping diff --git a/python-pscheduler/pscheduler/tests/process_test.py b/python-pscheduler/pscheduler/tests/test_process.py similarity index 96% rename from python-pscheduler/pscheduler/tests/process_test.py rename to python-pscheduler/pscheduler/tests/test_process.py index 24d5e8f428..a4dee99ee6 100644 --- a/python-pscheduler/pscheduler/tests/process_test.py +++ b/python-pscheduler/pscheduler/tests/test_process.py @@ -6,7 +6,7 @@ import os import psutil -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.process import ( process_exists diff --git a/python-pscheduler/pscheduler/tests/program_test.py b/python-pscheduler/pscheduler/tests/test_program.py similarity index 97% rename from python-pscheduler/pscheduler/tests/program_test.py rename to python-pscheduler/pscheduler/tests/test_program.py index d8de061545..00b3de9924 100644 --- a/python-pscheduler/pscheduler/tests/program_test.py +++ b/python-pscheduler/pscheduler/tests/test_program.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.program import run_program diff --git a/python-pscheduler/pscheduler/tests/psas_test.py b/python-pscheduler/pscheduler/tests/test_psas.py similarity index 97% rename from python-pscheduler/pscheduler/tests/psas_test.py rename to python-pscheduler/pscheduler/tests/test_psas.py index caff4474df..76cbbd9356 100644 --- a/python-pscheduler/pscheduler/tests/psas_test.py +++ b/python-pscheduler/pscheduler/tests/test_psas.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.psas import as_bulk_resolve diff --git a/python-pscheduler/pscheduler/tests/psdns_test.py b/python-pscheduler/pscheduler/tests/test_psdns.py similarity index 98% rename from python-pscheduler/pscheduler/tests/psdns_test.py rename to python-pscheduler/pscheduler/tests/test_psdns.py index 83fe2b43ac..cf41878df8 100644 --- a/python-pscheduler/pscheduler/tests/psdns_test.py +++ b/python-pscheduler/pscheduler/tests/test_psdns.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.psdns import dns_resolve, dns_bulk_resolve diff --git a/python-pscheduler/pscheduler/tests/psjson_test.py b/python-pscheduler/pscheduler/tests/test_psjson.py similarity index 98% rename from python-pscheduler/pscheduler/tests/psjson_test.py rename to python-pscheduler/pscheduler/tests/test_psjson.py index dbe51c4331..5f14215d95 100644 --- a/python-pscheduler/pscheduler/tests/psjson_test.py +++ b/python-pscheduler/pscheduler/tests/test_psjson.py @@ -8,7 +8,7 @@ import tempfile import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.psjson import * diff --git a/python-pscheduler/pscheduler/tests/psselect_test.py b/python-pscheduler/pscheduler/tests/test_psselect.py similarity index 96% rename from python-pscheduler/pscheduler/tests/psselect_test.py rename to python-pscheduler/pscheduler/tests/test_psselect.py index 4236d0b07e..54dee583e4 100644 --- a/python-pscheduler/pscheduler/tests/psselect_test.py +++ b/python-pscheduler/pscheduler/tests/test_psselect.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.psselect import * diff --git a/python-pscheduler/pscheduler/tests/pssleep_test.py b/python-pscheduler/pscheduler/tests/test_pssleep.py similarity index 96% rename from python-pscheduler/pscheduler/tests/pssleep_test.py rename to python-pscheduler/pscheduler/tests/test_pssleep.py index 5b7f8b4faf..84cf18021a 100644 --- a/python-pscheduler/pscheduler/tests/pssleep_test.py +++ b/python-pscheduler/pscheduler/tests/test_pssleep.py @@ -6,7 +6,7 @@ import datetime import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.pstime import time_now from pscheduler.pssleep import sleep_until diff --git a/python-pscheduler/pscheduler/tests/psurl_test.py b/python-pscheduler/pscheduler/tests/test_psurl.py similarity index 98% rename from python-pscheduler/pscheduler/tests/psurl_test.py rename to python-pscheduler/pscheduler/tests/test_psurl.py index c7b0af583b..8765fe0947 100644 --- a/python-pscheduler/pscheduler/tests/psurl_test.py +++ b/python-pscheduler/pscheduler/tests/test_psurl.py @@ -14,7 +14,7 @@ pass -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.psurl import * diff --git a/python-pscheduler/pscheduler/tests/retry_test.py b/python-pscheduler/pscheduler/tests/test_retry.py similarity index 96% rename from python-pscheduler/pscheduler/tests/retry_test.py rename to python-pscheduler/pscheduler/tests/test_retry.py index 48c7c17a0e..3a9759148b 100644 --- a/python-pscheduler/pscheduler/tests/retry_test.py +++ b/python-pscheduler/pscheduler/tests/test_retry.py @@ -6,7 +6,7 @@ import datetime import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.retry import RetryPolicy diff --git a/python-pscheduler/pscheduler/tests/sinumber_test.py b/python-pscheduler/pscheduler/tests/test_sinumber.py similarity index 98% rename from python-pscheduler/pscheduler/tests/sinumber_test.py rename to python-pscheduler/pscheduler/tests/test_sinumber.py index 82153831ff..d30ce42b99 100644 --- a/python-pscheduler/pscheduler/tests/sinumber_test.py +++ b/python-pscheduler/pscheduler/tests/test_sinumber.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.sinumber import number_as_si, si_as_number, si_range diff --git a/python-pscheduler/pscheduler/tests/speccli_test.py b/python-pscheduler/pscheduler/tests/test_speccli.py similarity index 93% rename from python-pscheduler/pscheduler/tests/speccli_test.py rename to python-pscheduler/pscheduler/tests/test_speccli.py index 434a7fa277..4f46464d5a 100644 --- a/python-pscheduler/pscheduler/tests/speccli_test.py +++ b/python-pscheduler/pscheduler/tests/test_speccli.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.speccli import speccli_build_args diff --git a/python-pscheduler/pscheduler/tests/stringmatcher_test.py b/python-pscheduler/pscheduler/tests/test_stringmatcher.py similarity index 95% rename from python-pscheduler/pscheduler/tests/stringmatcher_test.py rename to python-pscheduler/pscheduler/tests/test_stringmatcher.py index 7c343e0bd8..179e657dc9 100644 --- a/python-pscheduler/pscheduler/tests/stringmatcher_test.py +++ b/python-pscheduler/pscheduler/tests/test_stringmatcher.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.stringmatcher import StringMatcher diff --git a/python-pscheduler/pscheduler/tests/text_test.py b/python-pscheduler/pscheduler/tests/test_text.py similarity index 92% rename from python-pscheduler/pscheduler/tests/text_test.py rename to python-pscheduler/pscheduler/tests/test_text.py index ecce0b94c7..bc3bd52265 100644 --- a/python-pscheduler/pscheduler/tests/text_test.py +++ b/python-pscheduler/pscheduler/tests/test_text.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.text import prefixed_wrap diff --git a/python-pscheduler/pscheduler/tests/threadsafe_test.py b/python-pscheduler/pscheduler/tests/test_threadsafe.py similarity index 96% rename from python-pscheduler/pscheduler/tests/threadsafe_test.py rename to python-pscheduler/pscheduler/tests/test_threadsafe.py index 762d93b906..7b538a50fd 100644 --- a/python-pscheduler/pscheduler/tests/threadsafe_test.py +++ b/python-pscheduler/pscheduler/tests/test_threadsafe.py @@ -5,7 +5,7 @@ import unittest -from base_test import PschedTestBase +from test_base import PschedTestBase from pscheduler.threadsafe import ThreadSafeSet from pscheduler.threadsafe import ThreadWithReturnValue diff --git a/python-pscheduler/pscheduler/unibuild-packaging/deb/control b/python-pscheduler/pscheduler/unibuild-packaging/deb/control index 85e32cdf2d..db8c647a72 100644 --- a/python-pscheduler/pscheduler/unibuild-packaging/deb/control +++ b/python-pscheduler/pscheduler/unibuild-packaging/deb/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: perfSONAR developers Build-Depends: debhelper (>= 10), python3-all, dh-python, - python3-setuptools, python3-nose, numactl, + python3-setuptools, python3-nose2, numactl, python3-ntplib, python3-tz, python3-tzlocal, python3-netifaces, python3-psycopg2 (>= 2.5.4), python3-jinja2, python3-jsonschema (>= 3.0.1~0), python3-isodate (>= 0.5.0), python3-netaddr, python3-psutil, diff --git a/python-pscheduler/pscheduler/unibuild-packaging/deb/patches/classes.patch b/python-pscheduler/pscheduler/unibuild-packaging/deb/patches/classes.patch index 93ab8da612..019f784b99 100644 --- a/python-pscheduler/pscheduler/unibuild-packaging/deb/patches/classes.patch +++ b/python-pscheduler/pscheduler/unibuild-packaging/deb/patches/classes.patch @@ -18,11 +18,11 @@ Index: b/Makefile - -test: file-setup +test: - python3 -m nose + python3 -m nose2 -test-coverage: file-setup +test-coverage: - python3 -m nose --with-coverage --cover-package rabbitmq + python3 -m nose2 --with-coverage --cover-package rabbitmq -build: file-setup test diff --git a/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec b/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec index 440f8fe9ba..800af88100 100644 --- a/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec +++ b/python-pscheduler/pscheduler/unibuild-packaging/rpm/python-pscheduler.spec @@ -53,7 +53,7 @@ Requires: rpm-post-wrapper BuildRequires: pscheduler-rpm BuildRequires: %{_pscheduler_python} BuildRequires: %{_pscheduler_python}-coverage -BuildRequires: %{_pscheduler_python}-nose +BuildRequires: %{_pscheduler_python}-nose2 BuildRequires: %{_pscheduler_python}-setuptools # NOTE: Cloned from above. BuildRequires: iputils diff --git a/unibuild-order b/unibuild-order index eda2afa81a..b29d1cccd2 100755 --- a/unibuild-order +++ b/unibuild-order @@ -77,9 +77,6 @@ ifelse(FAMILY/eval(MAJOR <= 8),RedHat/1,python-jsonschema) # Only build on EL8 python-kafka python-nmap3 -# TODO: This was deprecated after EL8. Switch to something new. -ifelse(FAMILY/eval(MAJOR >= 9),RedHat/1,python-nose) - ifelse(FAMILY/eval(MAJOR >= 9),RedHat/1,python-ntplib) python-parse-crontab python-vine