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

[Adam Collard]

Fix error message matcher for LXD 3.0

Fix bit-rotted test

Release 1.2.5

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'NEWS.rst'
--- NEWS.rst	2017-03-16 17:56:50 +0000
+++ NEWS.rst	2018-08-13 08:28:43 +0000
@@ -4,8 +4,14 @@
 
 Overview of changes to ols-vms in reverse chronological order.
 
-dev
-===
+1.2.5
+=====
+
+* Fix bug with LXD 3.0 in 'vms.lxd.lxd_info'.
+
+
+1.2.4
+=====
 
 * Fix setup failure when running on a host where bzr is not installed.
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-03-16 17:57:55 +0000
+++ debian/changelog	2018-08-13 08:28:43 +0000
@@ -1,3 +1,9 @@
+ols-vms (1.2.5) unstable; urgency=medium
+
+  * Fix bug with LXD 3.0 in vms.lxd.lxd_info.
+
+ -- Adam Collard <[e-mail]>  Mon, 13 Aug 2018 09:01:37 +0100
+
 ols-vms (1.2.4) unstable; urgency=medium
 
   * Fix setup failure when running on a host where bzr is not installed.
 
=== modified file 'olsvms/__init__.py'
--- olsvms/__init__.py	2017-03-16 17:57:55 +0000
+++ olsvms/__init__.py	2018-08-13 08:28:43 +0000
@@ -19,4 +19,4 @@
 # the release level is 'dev' or 'final'. The
 # version_info value corresponding to the olsvms version 2.0 is (2, 0, 0,
 # 'final', 0).
-__version__ = (1, 2, 4, 'final', 0)
+__version__ = (1, 2, 5, 'final', 0)
 
=== modified file 'olsvms/tests/test_config.py'
--- olsvms/tests/test_config.py	2017-03-15 16:25:51 +0000
+++ olsvms/tests/test_config.py	2018-08-13 08:28:43 +0000
@@ -139,10 +139,10 @@
 
     def test_lxd_invalid_nesting(self):
         self.conf.set('lxd.nesting', 'true')
-        with self.assertRaises(errors.OptionValueError) as cm:
+        with self.assertRaisesRegexp(
+                errors.OptionValueError,
+                'lxd.nesting: Value "true" is not valid.'):
             self.conf.get('lxd.nesting')
-        self.assertEqual('lxd.nesting: Value "true" is not valid.',
-                         str(cm.exception))
 
 
 class TestPathOption(unittest.TestCase):
 
=== modified file 'olsvms/vms/lxd.py'
--- olsvms/vms/lxd.py	2017-02-13 16:43:25 +0000
+++ olsvms/vms/lxd.py	2018-08-13 08:28:43 +0000
@@ -87,7 +87,8 @@
         try:
             _, source, err = subprocesses.run(info_command)
         except errors.CommandError as e:
-            if e.err == 'error: not found\n':
+            if e.err in ('error: not found\n',
+                         'Error: not found\n'):
                 return info
             else:
                 raise