Merge ~pkopylov/qa-regression-testing/+git/qa-regression-testing-1:fix-test-apparmor into qa-regression-testing:master

Proposed by Pavel Kopylov
Status: Merged
Merged at revision: 77f99d7e336162a23bd859d526882d8d1df27266
Proposed branch: ~pkopylov/qa-regression-testing/+git/qa-regression-testing-1:fix-test-apparmor
Merge into: qa-regression-testing:master
Diff against target: 12 lines (+1/-0)
1 file modified
scripts/test-apparmor.py (+1/-0)
Reviewer Review Type Date Requested Status
Alex Murray Approve
Review via email: mp+439473@code.launchpad.net

Commit message

fix test-apparmor to have a necessary python2 package.

Description of the change

This commit https://git.launchpad.net/qa-regression-testing/commit/?id=f80582b956774464656fa1680740049695b27afd fixed the mess with PYTHON environment variables leads to running some tests in the python3 context instead of the python2 one.

However, the system should have the package python-apparmor installed. This package contains modules for python2.

To post a comment you must log in.
Revision history for this message
Alex Murray (alexmurray) wrote :

LGTM - thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/test-apparmor.py b/scripts/test-apparmor.py
2index 0886cff..24e491b 100755
3--- a/scripts/test-apparmor.py
4+++ b/scripts/test-apparmor.py
5@@ -24,6 +24,7 @@
6 # QRT-Alternates: python-libapparmor:!lucid python-libapparmor:!focal python-libapparmor:!jammy python-libapparmor:!kinetic python-libapparmor:!lunar python3-libapparmor:!lucid python3-libapparmor:!precise apparmor-easyprof:!precise apparmor-easyprof:!quantal apparmor-easyprof:!lucid devscripts:trusty python3-libapparmor:focal python3-libapparmor:jammy python3-libapparmor:kinetic python3-libapparmor:lunar pyflakes:!focal pyflakes:!jammy pyflakes:!kinetic pyflakes:!lunar pyflakes3:focal pyflakes3:jammy pyflakes3:kinetic pyflakes3:lunar python-pexpect:!focal python-pexpect:!jammy python-pexpect:!kinetic python-pexpect:!lunar python3-pexpect:focal python3-pexpect:jammy python3-pexpect:kinetic python3-pexpect:lunar python-is-python3:focal python-is-python3:jammy python-is-python3:kinetic python-is-python3:lunar python3-psutil dbus-tests:!trusty
7 # QRT-Alternates: python3-notify2
8 # QRT-Alternates: libapparmor-perl:!kinetic libapparmor-perl:!lunar
9+# QRT-Alternates: python-apparmor:trusty python-apparmor:xenial python-apparmor:bionic
10 # files and directories required for the test to run:
11 # QRT-Depends: apparmor/
12 # QRT-Privilege: root

Subscribers

People subscribed via source and target branches