Merge lp:~pieq/checkbox/fix-1489817-audio-settings-volume-regexp into lp:checkbox

[Pierre Equoy]

audio_settings script is used to store and restore values before and after audio tests.

To do this, it uses a few regular expressions. The one to find the volume value was wrong:

    volume_regex = re.compile("Volume: (?:0|front-left):\s*([0-9])*")

Later in the code, we use group(1) to retrieve the value. However, as you can see above, group(1) will always be only one digit.

>>> vol100 = "Volume: 0: 100% 1: 100%"
>>> vol46 = "Volume: 0: 46% 1: 46%"
>>> vol4 = "Volume: 0: 4% 1: 4%"

>>> vol_regex = re.compile("Volume: (?:0|front-left):\s*([0-9])*")

>>> vol_regex.search(vol100).group(1).strip()
'0'
>>> vol_regex.search(vol46).group(1).strip()
'6'

By switching two characters in the previous regexp, everything works as expected:

    volume_regex = re.compile("Volume: (?:0|front-left):\s*([0-9]*)")
                                                                 ^

>>> vol_regex = re.compile("Volume: (?:0|front-left):\s*([0-9]*)")

>>> vol_regex.search(vol46).group(1).strip()
'46'
>>> vol_regex.search(vol100).group(1).strip()
'100'
>>> vol_regex.search(vol4).group(1).strip()
'4'

I tested the patch with `audio/playback_auto` test and the sound is restored to its previous value correctly.

[Po-Hsu Lin (cypressyew)]

Looking good, thanks.

review: Approve

=== modified file 'checkbox-support/checkbox_support/scripts/audio_settings.py'
--- checkbox-support/checkbox_support/scripts/audio_settings.py	2015-06-08 17:00:38 +0000
+++ checkbox-support/checkbox_support/scripts/audio_settings.py	2015-09-02 04:20:41 +0000
@@ -38,7 +38,7 @@
 default_pattern = "(?<=Default %s: ).*"
 index_regex = re.compile("(?<=index: )[0-9]*")
 muted_regex = re.compile("(?<=Mute: ).*")
-volume_regex = re.compile("Volume: (?:0|front-left):\s*([0-9])*")
+volume_regex = re.compile("Volume: (?:0|front-left):\s*([0-9]*)")
 name_regex = re.compile("(?<=Name:).*")
 
 entry_pattern = "Name: %s.*?(?=Properties)"