Merge lp:~adam-collard/ols-vms/lxd-3.0 into lp:ols-vms

Proposed by Adam Collard on 2018-08-13
Status: Merged
Approved by: Adam Collard on 2018-08-13
Approved revision: 306
Merge reported by: Otto Co-Pilot
Merged at revision: 303
Proposed branch: lp:~adam-collard/ols-vms/lxd-3.0
Merge into: lp:ols-vms
Diff against target: 76 lines (+20/-7)
5 files modified
NEWS.rst (+8/-2)
debian/changelog (+6/-0)
olsvms/__init__.py (+1/-1)
olsvms/tests/test_config.py (+3/-3)
olsvms/vms/lxd.py (+2/-1)
To merge this branch: bzr merge lp:~adam-collard/ols-vms/lxd-3.0
Reviewer Review Type Date Requested Status
Colin Watson 2018-08-13 Approve on 2018-08-13
Review via email: mp+352954@code.launchpad.net

Commit message

Fix error message matcher for LXD 3.0

Fix bit-rotted test

Release 1.2.5

To post a comment you must log in.
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS.rst'
2--- NEWS.rst 2017-03-16 17:56:50 +0000
3+++ NEWS.rst 2018-08-13 08:28:43 +0000
4@@ -4,8 +4,14 @@
5
6 Overview of changes to ols-vms in reverse chronological order.
7
8-dev
9-===
10+1.2.5
11+=====
12+
13+* Fix bug with LXD 3.0 in 'vms.lxd.lxd_info'.
14+
15+
16+1.2.4
17+=====
18
19 * Fix setup failure when running on a host where bzr is not installed.
20
21
22=== modified file 'debian/changelog'
23--- debian/changelog 2017-03-16 17:57:55 +0000
24+++ debian/changelog 2018-08-13 08:28:43 +0000
25@@ -1,3 +1,9 @@
26+ols-vms (1.2.5) unstable; urgency=medium
27+
28+ * Fix bug with LXD 3.0 in vms.lxd.lxd_info.
29+
30+ -- Adam Collard <adam.collard@canonical.com> Mon, 13 Aug 2018 09:01:37 +0100
31+
32 ols-vms (1.2.4) unstable; urgency=medium
33
34 * Fix setup failure when running on a host where bzr is not installed.
35
36=== modified file 'olsvms/__init__.py'
37--- olsvms/__init__.py 2017-03-16 17:57:55 +0000
38+++ olsvms/__init__.py 2018-08-13 08:28:43 +0000
39@@ -19,4 +19,4 @@
40 # the release level is 'dev' or 'final'. The
41 # version_info value corresponding to the olsvms version 2.0 is (2, 0, 0,
42 # 'final', 0).
43-__version__ = (1, 2, 4, 'final', 0)
44+__version__ = (1, 2, 5, 'final', 0)
45
46=== modified file 'olsvms/tests/test_config.py'
47--- olsvms/tests/test_config.py 2017-03-15 16:25:51 +0000
48+++ olsvms/tests/test_config.py 2018-08-13 08:28:43 +0000
49@@ -139,10 +139,10 @@
50
51 def test_lxd_invalid_nesting(self):
52 self.conf.set('lxd.nesting', 'true')
53- with self.assertRaises(errors.OptionValueError) as cm:
54+ with self.assertRaisesRegexp(
55+ errors.OptionValueError,
56+ 'lxd.nesting: Value "true" is not valid.'):
57 self.conf.get('lxd.nesting')
58- self.assertEqual('lxd.nesting: Value "true" is not valid.',
59- str(cm.exception))
60
61
62 class TestPathOption(unittest.TestCase):
63
64=== modified file 'olsvms/vms/lxd.py'
65--- olsvms/vms/lxd.py 2017-02-13 16:43:25 +0000
66+++ olsvms/vms/lxd.py 2018-08-13 08:28:43 +0000
67@@ -87,7 +87,8 @@
68 try:
69 _, source, err = subprocesses.run(info_command)
70 except errors.CommandError as e:
71- if e.err == 'error: not found\n':
72+ if e.err in ('error: not found\n',
73+ 'Error: not found\n'):
74 return info
75 else:
76 raise

Subscribers

People subscribed via source and target branches