QA Regression Testing

Merge ~paelzer/qa-regression-testing:fix-strongswan-20.04 into qa-regression-testing:master

  1. Git
  2. lp:~paelzer/qa-regression-testing
  3. fix-strongswan-20.04
  4. Merge into master
Proposed by Christian Ehrhardt 
Status: Merged
Merged at revision: 623e01a9a057d4af61562e14618572f2fab3ce5e
Proposed branch: ~paelzer/qa-regression-testing:fix-strongswan-20.04
Merge into: qa-regression-testing:master
Diff against target: 43 lines (+15/-3)
1 file modified
scripts/test-strongswan.py (+15/-3)
Reviewer Review Type Date Requested Status
Alex Murray Approve
Review via email: mp+375711@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alex Murray (alexmurray) wrote :

Thanks - looks good to me - tested and works in focal!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/test-strongswan.py b/scripts/test-strongswan.py
2index 52baded..7b9862e 100755
3--- a/scripts/test-strongswan.py
4+++ b/scripts/test-strongswan.py
5@@ -78,7 +78,11 @@ class StrongswanTest(testlib.TestlibCase):
6 '''Configure strongswan, interfaces, and routing'''
7
8 # Stop daemon
9- if self.lsb_release['Release'] >= 15.04:
10+ if self.lsb_release['Release'] >= 20.04:
11+ # now called strongswan-starter or ipsec
12+ # ipsec was existing before, so it is more compatible
13+ self.assertShellExitEquals(0, ['systemctl', 'stop', 'ipsec'])
14+ elif self.lsb_release['Release'] >= 15.04:
15 testlib.cmd(['sytemctl', 'stop', 'strongswan'])
16 else:
17 testlib.cmd(['stop', 'strongswan'])
18@@ -321,7 +325,11 @@ H0jOhDdJBKpns4w=
19 -----END PRIVATE KEY-----''')
20
21 # Start daemons
22- if self.lsb_release['Release'] >= 15.04:
23+ if self.lsb_release['Release'] >= 20.04:
24+ # now called strongswan-starter or ipsec
25+ # ipsec was existing before, so it is more compatible
26+ self.assertShellExitEquals(0, ['systemctl', 'start', 'ipsec'])
27+ elif self.lsb_release['Release'] >= 15.04:
28 self.assertShellExitEquals(0, ['systemctl', 'start', 'strongswan'])
29 else:
30 self.assertShellExitEquals(0, ['start', 'strongswan'])
31@@ -362,7 +370,11 @@ H0jOhDdJBKpns4w=
32
33 # Wait for remote end to finish pings
34 time.sleep(5)
35- if self.lsb_release['Release'] >= 15.04:
36+ if self.lsb_release['Release'] >= 20.04:
37+ # now called strongswan-starter or ipsec
38+ # ipsec was existing before, so it is more compatible
39+ self.assertShellExitEquals(0, ['systemctl', 'stop', 'ipsec'])
40+ elif self.lsb_release['Release'] >= 15.04:
41 self.assertShellExitEquals(0, ['systemctl', 'stop', 'strongswan'])
42 else:
43 self.assertShellExitEquals(0, ['stop', 'strongswan'])

Subscribers

People subscribed via source and target branches