Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 1386 #1474

Open
wants to merge 6 commits into
base: 5.2.0
Choose a base branch
from
Open

Issue 1386 #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ce125d
Modified python-pscheduler to use nose2
abigailfox Sep 6, 2024
6e6fce5
Modified python-pscheduler to use nose2
abigailfox Sep 6, 2024
1cfe759
Added support for nose2 to pscheduler
abigailfox Sep 6, 2024
5878f7d
Corrected typo in logging
abigailfox Sep 10, 2024
167f9da
Fully remove nose from unibuild
abigailfox Sep 16, 2024
04ae44f
Merge remote-tracking branch 'origin/5.2.0' into issue-1386
abigailfox Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pscheduler-archiver-esmond/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pscheduler-archiver-esmond/esmond/unibuild-packaging/rpm/pscheduler-archiver-esmond.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pscheduler-archiver-http/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
4 changes: 2 additions & 2 deletions pscheduler-archiver-rabbitmq/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
4 changes: 2 additions & 2 deletions pscheduler-archiver-syslog/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
4 changes: 2 additions & 2 deletions pscheduler-archiver-tcp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
2 changes: 1 addition & 1 deletion pscheduler-archiver-tcp/tcp/unibuild-packaging/rpm/pscheduler-archiver-tcp.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pscheduler-archiver-udp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
2 changes: 1 addition & 1 deletion pscheduler-archiver-udp/udp/unibuild-packaging/rpm/pscheduler-archiver-udp.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pscheduler-test-latency/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pscheduler-test-latency/latency/unibuild-packaging/rpm/pscheduler-test-latency.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pscheduler-test-latencybg/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pscheduler-test-latencybg/latencybg/unibuild-packaging/rpm/pscheduler-test-latencybg.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions pscheduler-test-rtt/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pscheduler-test-rtt/rtt/unibuild-packaging/rpm/pscheduler-test-rtt.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pscheduler-test-throughput/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pscheduler-test-throughput/throughput/unibuild-packaging/rpm/pscheduler-test-throughput.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pscheduler-test-trace/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pscheduler-test-trace/trace/unibuild-packaging/rpm/pscheduler-test-trace.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pscheduler-tool-owping/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pscheduler-tool-owping/owping/unibuild-packaging/rpm/pscheduler-tool-owping.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pscheduler-tool-powstream/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pscheduler-tool-powstream/powstream/unibuild-packaging/rpm/pscheduler-tool-powstream.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pscheduler-tool-twping/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pscheduler-tool-twping/twping/unibuild-packaging/rpm/pscheduler-tool-twping.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions python-nose/Makefile
View file
Open in desktop

This file was deleted.

Binary file removed python-nose/nose-1.3.7.tar.gz
View file
Open in desktop
Binary file not shown.
21 changes: 0 additions & 21 deletions python-nose/unibuild-packaging/rpm/python-nose-coverage4.patch
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions python-nose/unibuild-packaging/rpm/python-nose-py35.patch
View file
Open in desktop

This file was deleted.

69 changes: 0 additions & 69 deletions python-nose/unibuild-packaging/rpm/python-nose-py36.patch
View file
Open in desktop

This file was deleted.

Loading