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

makefile: use only system nox #1135

Merged
merged 3 commits into from
Oct 28, 2023
Merged

makefile: use only system nox #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f9de87
makefile: use only system nox
svinota Oct 28, 2023
9d3de37
tests: mark test_l2tp as xfail
svinota Oct 28, 2023
c9c0fca
tests: turn off ndb chaotic test
svinota Oct 28, 2023
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
6 changes: 1 addition & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/test_linux/test_generic/test_l2tp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion tests/test_linux/test_ndb/test_chaotic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down