Merge ~kleber-souza/qa-regression-testing:master into qa-regression-testing:master

Proposed by Kleber Sacilotto de Souza
Status: Merged
Approved by: Alex Murray
Approved revision: c1af010b49291e5526ccac85cd1fd334fa3bd0c5
Merge reported by: Alex Murray
Merged at revision: c1af010b49291e5526ccac85cd1fd334fa3bd0c5
Proposed branch: ~kleber-souza/qa-regression-testing:master
Merge into: qa-regression-testing:master
Diff against target: 14 lines (+2/-2)
1 file modified
scripts/test-kernel-security.py (+2/-2)
Reviewer Review Type Date Requested Status
Alex Murray Approve
Review via email: mp+400660@code.launchpad.net
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
diff --git a/scripts/test-kernel-security.py b/scripts/test-kernel-security.py
index 7101e8c..fd6d217 100755
--- a/scripts/test-kernel-security.py
+++ b/scripts/test-kernel-security.py
@@ -1885,8 +1885,8 @@ class KernelSecurityTest(KernelSecurityBaseTest):
1885 # chown should fail, but also should not clear fs caps1885 # chown should fail, but also should not clear fs caps
1886 self.assertShellExitEquals(1, ['sudo', '-u', user, 'chown', user, testbin])1886 self.assertShellExitEquals(1, ['sudo', '-u', user, 'chown', user, testbin])
18871887
1888 if not self.kernel_at_least('4.9'):1888 if not self.kernel_at_least('4.4'):
1889 self._skipped("Kernels before 4.9 need to fix CVE-2015-1350")1889 self._skipped("Kernels before 4.4 need to fix CVE-2015-1350")
1890 exp_output = ''1890 exp_output = ''
1891 self.assertShellOutputEquals(exp_output, ['sudo', '-u', user, 'getcap', testbin])1891 self.assertShellOutputEquals(exp_output, ['sudo', '-u', user, 'getcap', testbin])
18921892

Subscribers

People subscribed via source and target branches