nose: T7825: Use nose2 for unit tests

sarthurdev · sarthurdev · commit 45ac29070e1a · 2025-09-18T16:44:26.000+02:00
diff --git a/Makefile b/Makefile
@@ -101,7 +101,7 @@ clean:
 .PHONY: test
 test: generate-configd-include-json
 	set -e; python3 -m compileall -q -x '/vmware-tools/scripts/' .
-	PYTHONPATH=python/ python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators,src/tests --verbose
+	PYTHONPATH=python/ python3 -m nose2 -v
 
 .PHONY: check_migration_scripts_executable
 .ONESHELL:
diff --git a/debian/control b/debian/control
@@ -34,7 +34,7 @@ Build-Depends:
   python3-hurry.filesize,
   python3-netaddr,
   python3-netifaces,
-  python3-nose,
+  python3-nose2,
   python3-jinja2,
   python3-paramiko,
   python3-passlib,
diff --git a/nose2.cfg b/nose2.cfg
@@ -0,0 +1,9 @@
+[unittest]
+start-dir = src
+code-directories = conf_mode
+                   op_mode
+                   completion
+                   validators
+                   tests
+test-file-pattern = test_*.py
+test-method-prefix = test
diff --git a/python/vyos/airbag.py b/python/vyos/airbag.py
@@ -24,6 +24,8 @@
 
 
 def enable(log=True):
+    if 'nose2' in sys.modules:
+        return
     if log:
         _intercepting_logger()
     _intercepting_exceptions()
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,6 +1,6 @@
 python/
 lxml
 pylint
-nose
+nose2
 coverage
 jinja2

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 python/
 lxml
 pylint
 -nose
 +nose2
 coverage
 jinja2