From 8d3fc6587afba692e488dc138fd1d2d1050a1689 Mon Sep 17 00:00:00 2001
From: Peter Saveliev <peter@svinota.eu>
Date: Fri, 9 Feb 2024 23:50:09 +0100
Subject: [PATCH 1/3] ci: rename nox sessions for linux

Avoid ambuguity in session names
---
 noxfile.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index f53633245..5322fc93e 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -15,10 +15,10 @@
     'lab',
     'neutron',
     'integration',
-    'linux-3.6',
-    'linux-3.8',
-    'linux-3.10',
-    'linux-3.12',
+    'linux-python3.6',
+    'linux-python3.8',
+    'linux-python3.10',
+    'linux-python3.12',
     'minimal',
 ]
 
@@ -245,7 +245,7 @@ def integration(session, config):
     session.run(*options('test_integration', config))
 
 
-@nox.session(python=['3.6', '3.8', '3.10', '3.12'])
+@nox.session(python=['python3.6', 'python3.8', 'python3.10', 'python3.12'])
 @add_session_config
 def linux(session, config):
     '''Run Linux functional tests. Requires root to run all the tests.'''

From febea11302771697c016c75cb684191579db15d4 Mon Sep 17 00:00:00 2001
From: Peter Saveliev <peter@svinota.eu>
Date: Fri, 9 Feb 2024 23:51:16 +0100
Subject: [PATCH 2/3] ci: fix unprivileged runs for test_ipr

---
 tests/test_linux/test_ipr/test_config.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_linux/test_ipr/test_config.py b/tests/test_linux/test_ipr/test_config.py
index 83303e202..159da6a53 100644
--- a/tests/test_linux/test_ipr/test_config.py
+++ b/tests/test_linux/test_ipr/test_config.py
@@ -1,7 +1,10 @@
 import pytest
+from pr2test.marks import require_root
 
 from pyroute2 import IPRoute
 
+pytestmark = [require_root()]
+
 
 @pytest.mark.parametrize('nlm_echo', (True, False))
 def test_echo_route(context, nlm_echo):

From abf827836f73778205f3bf6b6adf141440fbaa58 Mon Sep 17 00:00:00 2001
From: Peter Saveliev <peter@svinota.eu>
Date: Fri, 9 Feb 2024 23:55:26 +0100
Subject: [PATCH 3/3] ci: fix nox session names for github workflows

---
 .github/workflows/pull_request.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 0766a0992..8e4e44ad1 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -62,17 +62,17 @@ jobs:
     steps:
       - run: sudo chown -R $USER:$USER $GITHUB_WORKSPACE
       - uses: actions/checkout@v4
-      - run: sudo make nox session=linux-3.6
-      - run: sudo make nox session=linux-3.8
-      - run: sudo make nox session=linux-3.10
-      - run: sudo make nox session=linux-3.12
+      - run: sudo make nox session=linux-python3.6
+      - run: sudo make nox session=linux-python3.8
+      - run: sudo make nox session=linux-python3.10
+      - run: sudo make nox session=linux-python3.12
   linux-ubuntu-22:
     runs-on: linux-ubuntu-22
     steps:
       - run: sudo chown -R $USER:$USER $GITHUB_WORKSPACE
       - uses: actions/checkout@v4
-      - run: sudo make nox session=linux-3.6
-      - run: sudo make nox session=linux-3.10
+      - run: sudo make nox session=linux-python3.6
+      - run: sudo make nox session=linux-python3.10
   openbsd:
     runs-on: OpenBSD
     steps: