Attachment 902298 Details for Bug 1084578 – additional patch to map device numid to pcm

[patch] additional patch to map device numid to pcm

0001-1084578-Audio-HDMI-test-failed-with-Error-aplay-comm.patch (text/plain), 2.59 KB, created by Greg Nichols on 2014-06-04 19:13:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-06-04 19:13:37 UTC

Size: 2.59 KB

patch

obsolete

>From d8c45fa0433c9def5c2ba3adc536234ea9092e8d Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Wed, 4 Jun 2014 15:12:38 -0400
>Subject: [PATCH] 1084578 - Audio HDMI test failed with Error: aplay command
> failed
>
>---
> tests/audio/audio.py | 29 +++++++++++++++++------------
> 1 file changed, 17 insertions(+), 12 deletions(-)
>
>diff --git a/tests/audio/audio.py b/tests/audio/audio.py
>index 977c01b..62023b5 100644
>--- a/tests/audio/audio.py
>+++ b/tests/audio/audio.py
>@@ -57,26 +57,31 @@ class AudioTest(Test):
> 
>     def getDeviceNumber(self):
>         self.deviceNumber = -1
>-        idPattern = re.compile("numid=(?P<id>[0-9]+)")
>+        numidPattern = re.compile("numid=(?P<id>[0-9]+)")
>+        pcmPattern = re.compile("pcm=(?P<id>[0-9]+)")
>         pipe = os.popen("amixer -c %s controls" % self.cardNumber)
>         for line in pipe.readlines():
>             if "Capture" in line:
>                 self.captureSupport = True
>             if 'HDMI/DP,pcm=' in line:
>-                match = idPattern.search(line)
>+                match = numidPattern.search(line)
>                 if match:
>                     id = match.group("id")
>-                    checkStatusCommand = Command("amixer -c %s cget numid=%s" %(self.cardNumber, id))
>-                    try:
>-                        if checkStatusCommand.getString("values=on", singleLine=False):
>+                    match = pcmPattern.search(line)
>+                    if match:
>+                        pcm = match.group("id")
>+                        checkStatusCommand = Command("amixer -c %s cget numid=%s" %(self.cardNumber, id))
>+                        try:
>+                            if checkStatusCommand.getString("values=on", singleLine=False):
>+                                if self.debug != Constants.off:
>+                                    print "device numid = %s" % id
>+                                    print "device pcm = %s" % pcm
>+                                self.deviceNumber = pcm
>+                                break
>+                        except Exception, e:
>                             if self.debug != Constants.off:
>-                                print "device id = %s" % id
>-                            self.deviceNumber = id
>-                            break
>-                    except Exception, e:
>-                        if self.debug != Constants.off:
>-                            print "Exception searching for device id:"
>-                            print e
>+                                print "Exception searching for device id:"
>+                                print e
> 
> 
>     def run(self):
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1084578: 885900 | 902298