Merge lp:~sylvain-pineau/checkbox/fix-1495929 into lp:checkbox

[Sylvain Pineau]

A fix for the pactl parser of checkbox-support to be compatible with a new syntax of Volume properties (Vivid)

[Zygmunt Krynicki (zyga)]

really nice, +1

review: Approve

=== modified file 'checkbox-support/checkbox_support/parsers/pactl.py'
--- checkbox-support/checkbox_support/parsers/pactl.py	2014-08-11 17:20:51 +0000
+++ checkbox-support/checkbox_support/parsers/pactl.py	2015-09-15 11:42:39 +0000
@@ -351,14 +351,21 @@
 VolumeAttributeValue = (
     p.Combine(
         p.Or([
-            p.Literal("(invalid)"),
-            p.Regex("([0-9]+: +[0-9]+% ?)+")
-        ])
-        + p.LineEnd()
-        + p.Optional(p.White('\t').suppress())
-        + p.Or([
-            p.Literal("(invalid)"),
-            p.Regex("([0-9]+: -?([0-9]+\.[0-9]+|inf) dB ?)+"),
+            p.Or([
+                p.Literal("(invalid)"),
+                p.Regex("([0-9]+: +[0-9]+% ?)+")
+            ])
+            + p.LineEnd()
+            + p.Optional(p.White('\t').suppress())
+            + p.Or([
+                p.Literal("(invalid)"),
+                p.Regex("([0-9]+: -?([0-9]+\.[0-9]+|inf) dB ?)+"),
+            ]),
+            p.Or([
+                p.Literal("(invalid)"),
+                p.Regex("([\w\-]+: [0-9]+ / +[0-9]+% /"
+                        " +-?([0-9]+\.[0-9]+|inf) dB,? *)+")
+            ])
         ])
         + p.LineEnd()
         + p.Optional(p.White('\t').suppress())

=== modified file 'checkbox-support/checkbox_support/parsers/tests/test_pactl.py'
--- checkbox-support/checkbox_support/parsers/tests/test_pactl.py	2015-06-10 15:37:53 +0000
+++ checkbox-support/checkbox_support/parsers/tests/test_pactl.py	2015-09-15 11:42:39 +0000
@@ -357,6 +357,20 @@
             '0: -13.40 dB 1: -13.40 dB\n'
             'balance 0.00\n'))
 
+    def test_volume_variant1(self):
+        # pactl Volume properties differ with recent PulseAudio versions
+        attr = self.assertParses(
+            pactl.GenericSimpleAttribute.Syntax, (
+                'Volume: front-left: 52428 /  80% / -5.81 dB,   '
+                'front-right: 52428 /  80% / -5.81 dB\n'
+                '         balance 0.00\n')
+        )['attribute']
+        self.assertEqual(attr.name, 'Volume')
+        self.assertEqual(attr.value, (
+            'front-left: 52428 /  80% / -5.81 dB,   '
+            'front-right: 52428 /  80% / -5.81 dB\n'
+            'balance 0.00\n'))
+
     def test_inf_volume(self):
         # LP: 1350168
         attr = self.assertParses(