Merge ~cypressyew/qa-regression-testing:comma-fix into qa-regression-testing:master

Proposed by Po-Hsu Lin
Status: Merged
Merged at revision: 235b5715c73fb6fb3a751c43ab6d2a1a74fc2244
Proposed branch: ~cypressyew/qa-regression-testing:comma-fix
Merge into: qa-regression-testing:master
Diff against target: 13 lines (+1/-1)
1 file modified
scripts/test-kernel-security.py (+1/-1)
Reviewer Review Type Date Requested Status
Steve Beattie Approve
Review via email: mp+367820@code.launchpad.net

Commit message

The missing comma is causing failure to test_230_config_security_ipsec,
which complains:
    INET_XFRM_MODE_TUNNELINET_XFRM_MODE_BEET option was expected to be
    set in the kernel config.

To post a comment you must log in.
Revision history for this message
Steve Beattie (sbeattie) wrote :

Nice catch, thanks! Merged.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/test-kernel-security.py b/scripts/test-kernel-security.py
2index ad295c1..c5d6988 100755
3--- a/scripts/test-kernel-security.py
4+++ b/scripts/test-kernel-security.py
5@@ -2541,7 +2541,7 @@ class KernelSecurityConfigTest(KernelSecurityBaseTest):
6 # 5.2 kernel dropped these configs (commit
7 # 4c145dce26013763490df88f2473714f5bc7857d)
8 configs.extend([
9- 'INET_XFRM_MODE_TRANSPORT', 'INET_XFRM_MODE_TUNNEL'
10+ 'INET_XFRM_MODE_TRANSPORT', 'INET_XFRM_MODE_TUNNEL',
11 'INET_XFRM_MODE_BEET', 'INET6_XFRM_MODE_TRANSPORT',
12 'INET6_XFRM_MODE_TUNNEL', 'INET6_XFRM_MODE_BEET',
13 ])

Subscribers

People subscribed via source and target branches