tests: Merge pull request #1135 from svinota/system-nox

makefile: use only system nox tests: skip flaky & broken tests for now Bug-Url: #1135
svinota · Oct 28, 2023 · a39d6a6 · a39d6a6
2 parents 032f781 + c9c0fca
commit a39d6a6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -6,11 +6,7 @@
 python ?= $(shell util/find_python.sh)
 
 define nox
-	[ -d .venv ] || ${python} -m venv .venv
-	bash -c "source .venv/bin/activate; \
-		python -m pip install --upgrade pip; \
-		python -m pip install nox; \
-		nox $(1) -- '$(subst ",\",${noxconfig})'"
+	nox $(1) -- '$(subst ",\",${noxconfig})'
 endef
 
 .PHONY: all

diff --git a/tests/test_linux/test_generic/test_l2tp.py b/tests/test_linux/test_generic/test_l2tp.py
@@ -39,6 +39,7 @@ def l2ctx(context):
     context.l2tp.close()
 
 
+@pytest.mark.xfail(reason='flaky test, only to collect failure logs')
 def test_complete(l2ctx):
     # 1. create tunnel
     l2ctx.l2tp.create_tunnel(

diff --git a/tests/test_linux/test_ndb/test_chaotic.py b/tests/test_linux/test_ndb/test_chaotic.py
@@ -8,7 +8,7 @@
 
 
 @pytest.mark.xfail(reason='flaky test, only to collect failure logs')
-def test_add_del_ip_dict(context):
+def __test_add_del_ip_dict(context):
     ifname = context.new_ifname
     ifaddr1 = context.new_ipaddr
     ifaddr2 = context.new_ipaddr