Merge ~binli/checkbox-support/+git/checkbox-support:dmic-support into checkbox-support:master

[Bin Li]

* Let port-name support the blank space. (LP: #1875526)
* The name of port-label changed, so the way to detect HDMI/DP should be changed. (LP: #1875526)

[Sylvain Pineau (sylvain-pineau)]

Thanks a lot for the fix, this pactl parser is a pain to maintain across releases.

Could you attach to the test collection the `pactl list` output here:

https://git.launchpad.net/checkbox-support/tree/checkbox_support/parsers/tests/pactl_data

and write a unit test for this dmic:

https://git.launchpad.net/checkbox-support/tree/checkbox_support/parsers/tests/test_pactl.py

setup.py test should also tell you if the proposed fix does not add a regression to the older behaviors.

review: Needs Fixing

[Bin Li (binli)]

@Sylvain,

 Thanks for your feedback. And I try to run 'setup.py test' in the master branch, it also failed in several testcases. I just pasted part of result.

======================================================================
FAIL: test_SPDIF_in_port_label (checkbox_support.parsers.tests.test_pactl.AttributeTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/work/source/gits/checkbox-dev/checkbox-support/checkbox_support/parsers/tests/test_pactl.py", line 522, in test_SPDIF_in_port_label
    self.assertEqual(attr.value[0].latency_offset, 0)
AssertionError: ([0], {}) != 0

====================================================================== FAIL: test_many_ports (checkbox_support.parsers.tests.test_pactl.AttributeTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/work/source/gits/checkbox-dev/checkbox-support/checkbox_support/parsers/tests/test_pactl.py", line 443, in test_many_ports
    self.assertEqual(attr.value[0].availability, '')
AssertionError: ([''], {}) != ''

======================================================================
FAIL: test_one_port (checkbox_support.parsers.tests.test_pactl.AttributeTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/work/source/gits/checkbox-dev/checkbox-support/checkbox_support/parsers/tests/test_pactl.py", line 421, in test_one_port
    self.assertEq...

[Bin Li (binli)]

Ran 178 tests in 19.883s

FAILED (failures=10)
Test failed: <unittest.runner.TextTestResult run=178 errors=0 failures=10>
error: Test failed: <unittest.runner.TextTestResult run=178 errors=0 failures=10>

> @Sylvain,
>
> Thanks for your feedback. And I try to run 'setup.py test' in the master
> branch, it also failed in several testcases. I just pasted part of result.
>
> ======================================================================
> FAIL: test_SPDIF_in_port_label
> (checkbox_support.parsers.tests.test_pactl.AttributeTests)
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File "/work/source/gits/checkbox-dev/checkbox-
> support/checkbox_support/parsers/tests/test_pactl.py", line 522, in
> test_SPDIF_in_port_label
> self.assertEqual(attr.value[0].latency_offset, 0)
> AssertionError: ([0], {}) != 0
>
> ======================================================================
> FAIL: test_many_ports
> (checkbox_support.parsers.tests.test_pactl.AttributeTests)
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File "/work/source/gits/checkbox-dev/checkbox-
> support/checkbox_support/parsers/tests/test_pactl.py", line 443, in
> test_many_ports
> self.assertEqual(attr.value[0].availability, '')
> AssertionError: ([''], {}) != ''
>
> ======================================================================
> FAIL: test_one_port (checkbox_support.parsers.tests.test_pactl.AttributeTests)
> ----------------------------------------------------------------------
> Traceback (most recent call last):
> File "/work/source/gits/checkbox-dev/checkbox-
> support/checkbox_support/parsers/tests/test_pactl.py", line 421, in
> test_one_port
> self.assertEqual(attr.value[0].availability, 'available')
> AssertionError: (['available'], {}) != 'available'

[Sylvain Pineau (sylvain-pineau)]

Please use the 2.x version of pyparsing to run the tests, as pip will download the 3.x alpha:

sudo apt install python3-pyparsing

[Bin Li (binli)]

Thanks, it works fine now.

----------------------------------------------------------------------
Ran 178 tests in 18.711s

OK

[Bin Li (binli)]

@Sylvain,

 Please help review again, thanks!

[Sylvain Pineau (sylvain-pineau)]

It was not an easy fix, this pactl parser is one of the worst module to maintain across releases.
Thanks a lot.

review: Approve

[Bin Li (binli)]

Thanks a lot!

And I also learned a very excellent example to parse files from this project. :)

diff --git a/checkbox_support/parsers/pactl.py b/checkbox_support/parsers/pactl.py
index 8bc67c2..741f59b 100644
--- a/checkbox_support/parsers/pactl.py
+++ b/checkbox_support/parsers/pactl.py
@@ -226,7 +226,7 @@ class Port(Node):
     __syntax__ = (
         p.Optional('[Out] ').suppress()
         + p.Optional('[In] ').suppress()
-        + p.Word(p.alphanums + "-;").setResultsName('port-name')
+        + p.Word(p.alphanums + " -;").setResultsName('port-name')
         + p.Suppress(':')
         # This part was very tricky to write. The label is basically
         # arbitrary localized Unicode text.  We want to grab all of it in
@@ -291,7 +291,7 @@ class PortWithProfile(Node):
     __syntax__ = (
         p.Optional('[Out] ').suppress()
         + p.Optional('[In] ').suppress()
-        + p.Word(p.alphanums + "-;").setResultsName('port-name')
+        + p.Word(p.alphanums + " -;").setResultsName('port-name')
         + p.Suppress(':')
         # This part was very tricky to write. The label is basically arbitrary
         # localized Unicode text. We want to grab all of it in one go but
diff --git a/checkbox_support/parsers/tests/pactl_data/cards-desktop-bionic-x13.txt b/checkbox_support/parsers/tests/pactl_data/cards-desktop-bionic-x13.txt
 new file mode 100644
index 0000000..0236145
--- /dev/null
+++ b/checkbox_support/parsers/tests/pactl_data/cards-desktop-bionic-x13.txt
@@ -0,0 +1,41 @@
+Card #0
+	Name: alsa_card.pci-0000_00_1f.3-platform-skl_hda_dsp_generic
+	Driver: module-alsa-card.c
+	Owner Module: 7
+	Properties:
+		alsa.card = "0"
+		alsa.card_name = "sof-skl_hda_card"
+		alsa.long_card_name = "LENOVO-20T2SIT004-ThinkPadX13Gen1-20T2SIT004"
+		alsa.driver_name = "snd_soc_skl_hda_dsp"
+		device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic"
+		sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0"
+		device.bus = "pci"
+		device.vendor.id = "8086"
+		device.vendor.name = "Intel Corporation"
+		device.product.id = "02c8"
+		device.string = "0"
+		device.description = "sof-skl_hda_card"
+		module-udev-detect.discovered = "1"
+		device.icon_name = "audio-card-pci"
+	Profiles:
+		Hdmi3: Play to Hdmi3 (sinks: 1, sources: 2, priority: 1000, available: yes)
+		Hdmi2: Play to Hdmi2 (sinks: 1, sources: 2, priority: 1000, available: yes)
+		Hdmi1: Play to Hdmi1 (sinks: 1, sources: 2, priority: 1000, available: yes)
+		HiFi: Play HiFi Music (sinks: 1, sources: 2, priority: 8000, available: yes)
+		off: Off (sinks: 0, sources: 0, priority: 0, available: yes)
+	Active Profile: Hdmi2
+	Ports:
+		[Out] HDMI3: HDMI3/DP3 Output (priority: 500, latency offset: 0 usec, not available)
+			Part of profile(s): Hdmi3
+		[In] Dmic: Digital Microphone (priority: 100, latency offset: 0 usec)
+			Part of profile(s): Hdmi3, Hdmi2, Hdmi1, HiFi
+		[In] Headset Microphone: Headset Microphone (priority: 100, latency offset: 0 usec, not available)
+			Part of profile(s): Hdmi3, Hdmi2, Hdmi1, HiFi
+		[Out] HDMI2: HDMI2/DP2 Output (priority: 400, latency offset: 0 usec, available)
+			Part of profile(s): Hdmi2
+		[Out] HDMI1: HDMI1/DP1 Output (priority: 300, latency offset: 0 usec, not available)
+			Part of profile(s): Hdmi1
+		[Out] Headphone: Headphone (priority: 200, latency offset: 0 usec, not available)
+			Part of profile(s): HiFi
+		[Out] Speaker: Speaker (priority: 100, latency offset: 0 usec)
+			Part of profile(s): HiFi
diff --git a/checkbox_support/parsers/tests/pactl_data/desktop-bionic-x13.txt b/checkbox_support/parsers/tests/pactl_data/desktop-bionic-x13.txt
 new file mode 100644
index 0000000..78e8b95
--- /dev/null
+++ b/checkbox_support/parsers/tests/pactl_data/desktop-bionic-x13.txt
@@ -0,0 +1,685 @@
+Module #0
+	Name: module-device-restore
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Automatically restore the volume/mute state of devices"
+		module.version = "11.1"
+
+Module #1
+	Name: module-stream-restore
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Automatically restore the volume/mute/device state of streams"
+		module.version = "11.1"
+
+Module #2
+	Name: module-card-restore
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Automatically restore profile of cards"
+		module.version = "11.1"
+
+Module #3
+	Name: module-augment-properties
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Augment the property sets of streams with additional static information"
+		module.version = "11.1"
+
+Module #4
+	Name: module-switch-on-port-available
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		
+
+Module #5
+	Name: module-switch-on-connect
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Michael Terry"
+		module.description = "When a sink/source is added, switch to it or conditionally switch to it"
+		module.version = "11.1"
+
+Module #6
+	Name: module-udev-detect
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Detect available audio hardware and load matching drivers"
+		module.version = "11.1"
+
+Module #7
+	Name: module-alsa-card
+	Argument: device_id="0" name="pci-0000_00_1f.3-platform-skl_hda_dsp_generic" card_name="alsa_card.pci-0000_00_1f.3-platform-skl_hda_dsp_generic" namereg_fail=false tsched=yes fixed_latency_range=no ignore_dB=no deferred_volume=yes use_ucm=yes card_properties="module-udev-detect.discovered=1"
+	Usage counter: 0
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "ALSA Card"
+		module.version = "11.1"
+
+Module #8
+	Name: module-bluetooth-policy
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Frédéric Dalleau, Pali Rohár"
+		module.description = "Policy module to make using bluetooth devices out-of-the-box easier"
+		module.version = "11.1"
+
+Module #9
+	Name: module-bluetooth-discover
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "João Paulo Rechi Vita"
+		module.description = "Detect available Bluetooth daemon and load the corresponding discovery module"
+		module.version = "11.1"
+
+Module #10
+	Name: module-bluez5-discover
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "João Paulo Rechi Vita"
+		module.description = "Detect available BlueZ 5 Bluetooth audio devices and load BlueZ 5 Bluetooth audio drivers"
+		module.version = "11.1"
+
+Module #11
+	Name: module-native-protocol-unix
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Native protocol (UNIX sockets)"
+		module.version = "11.1"
+
+Module #12
+	Name: module-default-device-restore
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Automatically restore the default sink and source"
+		module.version = "11.1"
+
+Module #13
+	Name: module-rescue-streams
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "When a sink/source is removed, try to move its streams to the default sink/source"
+		module.version = "11.1"
+
+Module #14
+	Name: module-always-sink
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Colin Guthrie"
+		module.description = "Always keeps at least one sink loaded even if it's a null one"
+		module.version = "11.1"
+
+Module #15
+	Name: module-intended-roles
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Automatically set device of streams based on intended roles of devices"
+		module.version = "11.1"
+
+Module #16
+	Name: module-suspend-on-idle
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "When a sink/source is idle for too long, suspend it"
+		module.version = "11.1"
+
+Module #17
+	Name: module-console-kit
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Create a client for each ConsoleKit session of this user"
+		module.version = "11.1"
+
+Module #18
+	Name: module-systemd-login
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Create a client for each login session of this user"
+		module.version = "11.1"
+
+Module #19
+	Name: module-position-event-sounds
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Position event sounds between L and R depending on the position on screen of the widget triggering them."
+		module.version = "11.1"
+
+Module #20
+	Name: module-role-cork
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Mute & cork streams with certain roles while others exist"
+		module.version = "11.1"
+
+Module #21
+	Name: module-snap-policy
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Canonical Ltd"
+		module.description = "Ubuntu Snap policy management"
+		module.version = "11.1"
+
+Module #22
+	Name: module-filter-heuristics
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Colin Guthrie"
+		module.description = "Detect when various filters are desirable"
+		module.version = "11.1"
+
+Module #23
+	Name: module-filter-apply
+	Argument: 
+	Usage counter: n/a
+	Properties:
+		module.author = "Colin Guthrie"
+		module.description = "Load filter sinks automatically when needed"
+		module.version = "11.1"
+
+Module #24
+	Name: module-x11-publish
+	Argument: display=:0
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "X11 credential publisher"
+		module.version = "11.1"
+
+Module #25
+	Name: module-x11-bell
+	Argument: display=:0 sample=bell.ogg
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "X11 bell interceptor"
+		module.version = "11.1"
+
+Module #26
+	Name: module-x11-cork-request
+	Argument: display=:0
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "Synthesize X11 media key events when cork/uncork is requested"
+		module.version = "11.1"
+
+Module #27
+	Name: module-x11-xsmp
+	Argument: display=:0 session_manager=local/u-ThinkPad-X13-Gen-1:@/tmp/.ICE-unix/2045,unix/u-ThinkPad-X13-Gen-1:/tmp/.ICE-unix/2045
+	Usage counter: n/a
+	Properties:
+		module.author = "Lennart Poettering"
+		module.description = "X11 session management"
+		module.version = "11.1"
+
+Sink #42
+	State: SUSPENDED
+	Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.Hdmi2__hw_sofsklhdacard_4__sink
+	Description: sof-skl_hda_card HDMI2/DP2 Output
+	Driver: module-alsa-card.c
+	Sample Specification: s16le 2ch 48000Hz
+	Channel Map: front-left,front-right
+	Owner Module: 7
+	Mute: no
+	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
+	        balance 0.00
+	Base Volume: 65536 / 100% / 0.00 dB
+	Monitor Source: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.Hdmi2__hw_sofsklhdacard_4__sink.monitor
+	Latency: 0 usec, configured 0 usec
+	Flags: HARDWARE DECIBEL_VOLUME LATENCY 
+	Properties:
+		alsa.resolution_bits = "16"
+		device.api = "alsa"
+		device.class = "sound"
+		alsa.class = "generic"
+		alsa.subclass = "generic-mix"
+		alsa.name = ""
+		alsa.id = "HDMI2 (*)"
+		alsa.subdevice = "0"
+		alsa.subdevice_name = "subdevice #0"
+		alsa.device = "4"
+		alsa.card = "0"
+		alsa.card_name = "sof-skl_hda_card"
+		alsa.long_card_name = "LENOVO-20T2SIT004-ThinkPadX13Gen1-20T2SIT004"
+		alsa.driver_name = "snd_soc_skl_hda_dsp"
+		device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic"
+		sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0"
+		device.bus = "pci"
+		device.vendor.id = "8086"
+		device.vendor.name = "Intel Corporation"
+		device.product.id = "02c8"
+		device.string = "hw:sofsklhdacard,4"
+		device.buffering.buffer_size = "65472"
+		device.buffering.fragment_size = "16320"
+		device.access_mode = "mmap+timer"
+		device.profile.name = "Hdmi2: hw:sofsklhdacard,4: sink"
+		device.profile.description = "HDMI2/DP2 Output"
+		device.description = "sof-skl_hda_card HDMI2/DP2 Output"
+		module-udev-detect.discovered = "1"
+		device.icon_name = "audio-card-pci"
+	Ports:
+		[Out] HDMI2: HDMI2/DP2 Output (priority: 400, available)
+	Active Port: [Out] HDMI2
+	Formats:
+		pcm
+
+Source #84
+	State: SUSPENDED
+	Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.Hdmi2__hw_sofsklhdacard_4__sink.monitor
+	Description: Monitor of sof-skl_hda_card HDMI2/DP2 Output
+	Driver: module-alsa-card.c
+	Sample Specification: s16le 2ch 48000Hz
+	Channel Map: front-left,front-right
+	Owner Module: 7
+	Mute: no
+	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
+	        balance 0.00
+	Base Volume: 65536 / 100% / 0.00 dB
+	Monitor of Sink: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.Hdmi2__hw_sofsklhdacard_4__sink
+	Latency: 0 usec, configured 0 usec
+	Flags: DECIBEL_VOLUME LATENCY 
+	Properties:
+		device.description = "Monitor of sof-skl_hda_card HDMI2/DP2 Output"
+		device.class = "monitor"
+		alsa.card = "0"
+		alsa.card_name = "sof-skl_hda_card"
+		alsa.long_card_name = "LENOVO-20T2SIT004-ThinkPadX13Gen1-20T2SIT004"
+		alsa.driver_name = "snd_soc_skl_hda_dsp"
+		device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic"
+		sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0"
+		device.bus = "pci"
+		device.vendor.id = "8086"
+		device.vendor.name = "Intel Corporation"
+		device.product.id = "02c8"
+		device.string = "0"
+		module-udev-detect.discovered = "1"
+		device.icon_name = "audio-card-pci"
+	Formats:
+		pcm
+
+Source #85
+	State: SUSPENDED
+	Name: alsa_input.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.Hdmi2__hw_sofsklhdacard_6__source
+	Description: sof-skl_hda_card Digital Microphone
+	Driver: module-alsa-card.c
+	Sample Specification: s16le 2ch 48000Hz
+	Channel Map: front-left,front-right
+	Owner Module: 7
+	Mute: no
+	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
+	        balance 0.00
+	Base Volume: 65536 / 100% / 0.00 dB
+	Monitor of Sink: n/a
+	Latency: 0 usec, configured 0 usec
+	Flags: HARDWARE DECIBEL_VOLUME LATENCY 
+	Properties:
+		alsa.resolution_bits = "16"
+		device.api = "alsa"
+		device.class = "sound"
+		alsa.class = "generic"
+		alsa.subclass = "generic-mix"
+		alsa.name = ""
+		alsa.id = "DMIC32 (*)"
+		alsa.subdevice = "0"
+		alsa.subdevice_name = "subdevice #0"
+		alsa.device = "6"
+		alsa.card = "0"
+		alsa.card_name = "sof-skl_hda_card"
+		alsa.long_card_name = "LENOVO-20T2SIT004-ThinkPadX13Gen1-20T2SIT004"
+		alsa.driver_name = "snd_soc_skl_hda_dsp"
+		device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic"
+		sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0"
+		device.bus = "pci"
+		device.vendor.id = "8086"
+		device.vendor.name = "Intel Corporation"
+		device.product.id = "02c8"
+		device.string = "hw:sofsklhdacard,6"
+		device.buffering.buffer_size = "65472"
+		device.buffering.fragment_size = "16320"
+		device.access_mode = "mmap+timer"
+		device.profile.name = "Hdmi2: hw:sofsklhdacard,6: source"
+		device.profile.description = "Digital Microphone"
+		device.description = "sof-skl_hda_card Digital Microphone"
+		module-udev-detect.discovered = "1"
+		device.icon_name = "audio-card-pci"
+	Ports:
+		[In] Dmic: Digital Microphone (priority: 100)
+	Active Port: [In] Dmic
+	Formats:
+		pcm
+
+Source #86
+	State: SUSPENDED
+	Name: alsa_input.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.Hdmi2__hw_sofsklhdacard_0__source
+	Description: sof-skl_hda_card Headset Microphone
+	Driver: module-alsa-card.c
+	Sample Specification: s16le 2ch 48000Hz
+	Channel Map: front-left,front-right
+	Owner Module: 7
+	Mute: no
+	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
+	        balance 0.00
+	Base Volume: 65536 / 100% / 0.00 dB
+	Monitor of Sink: n/a
+	Latency: 0 usec, configured 0 usec
+	Flags: HARDWARE DECIBEL_VOLUME LATENCY 
+	Properties:
+		alsa.resolution_bits = "16"
+		device.api = "alsa"
+		device.class = "sound"
+		alsa.class = "generic"
+		alsa.subclass = "generic-mix"
+		alsa.name = ""
+		alsa.id = "HDA Analog (*)"
+		alsa.subdevice = "0"
+		alsa.subdevice_name = "subdevice #0"
+		alsa.device = "0"
+		alsa.card = "0"
+		alsa.card_name = "sof-skl_hda_card"
+		alsa.long_card_name = "LENOVO-20T2SIT004-ThinkPadX13Gen1-20T2SIT004"
+		alsa.driver_name = "snd_soc_skl_hda_dsp"
+		device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic"
+		sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0"
+		device.bus = "pci"
+		device.vendor.id = "8086"
+		device.vendor.name = "Intel Corporation"
+		device.product.id = "02c8"
+		device.string = "hw:sofsklhdacard,0"
+		device.buffering.buffer_size = "65472"
+		device.buffering.fragment_size = "16320"
+		device.access_mode = "mmap+timer"
+		device.profile.name = "Hdmi2: hw:sofsklhdacard,0: source"
+		device.profile.description = "Headset Microphone"
+		device.description = "sof-skl_hda_card Headset Microphone"
+		module-udev-detect.discovered = "1"
+		device.icon_name = "audio-card-pci"
+	Ports:
+		[In] Headset Microphone: Headset Microphone (priority: 100, not available)
+	Active Port: [In] Headset Microphone
+	Formats:
+		pcm
+
+Client #0
+	Driver: module-systemd-login.c
+	Owner Module: 18
+	Properties:
+		application.name = "Login Session 2"
+		systemd-login.session = "2"
+
+Client #1
+	Driver: protocol-native.c
+	Owner Module: 11
+	Properties:
+		application.name = "GNOME Shell"
+		native-protocol.peer = "UNIX socket client"
+		native-protocol.version = "32"
+		application.id = "org.gnome.Shell"
+		application.icon_name = "start-here"
+		application.language = "en_US.UTF-8"
+		window.x11.screen = "0"
+		window.x11.display = ":0"
+		application.process.id = "2184"
+		application.process.user = "u"
+		application.process.host = "u-ThinkPad-X13-Gen-1"
+		application.process.binary = "gnome-shell"
+		application.process.machine_id = "d565935cdbf64125b679eb560a79c787"
+		application.process.session_id = "2"
+
+Client #2
+	Driver: protocol-native.c
+	Owner Module: 11
+	Properties:
+		application.name = "GNOME Shell Volume Control"
+		native-protocol.peer = "UNIX socket client"
+		native-protocol.version = "32"
+		application.id = "org.gnome.VolumeControl"
+		application.icon_name = "multimedia-volume-control"
+		application.version = "3.28.4"
+		application.process.id = "2184"
+		application.process.user = "u"
+		application.process.host = "u-ThinkPad-X13-Gen-1"
+		application.process.binary = "gnome-shell"
+		application.language = "en_US.UTF-8"
+		window.x11.display = ":0"
+		application.process.machine_id = "d565935cdbf64125b679eb560a79c787"
+		application.process.session_id = "2"
+
+Client #8
+	Driver: module-x11-xsmp.c
+	Owner Module: 27
+	Properties:
+		application.name = "XSMP Session on gnome-session as 102c5c5ae2e20bde3b158804149680521100000020450059"
+		xsmp.vendor = "gnome-session"
+		xsmp.client.id = "102c5c5ae2e20bde3b158804149680521100000020450059"
+
+Client #9
+	Driver: protocol-native.c
+	Owner Module: 11
+	Properties:
+		application.name = "GNOME Volume Control Media Keys"
+		native-protocol.peer = "UNIX socket client"
+		native-protocol.version = "32"
+		application.id = "org.gnome.VolumeControl"
+		application.icon_name = "multimedia-volume-control"
+		application.version = ""
+		application.process.id = "2544"
+		application.process.user = "u"
+		application.process.host = "u-ThinkPad-X13-Gen-1"
+		application.process.binary = "gsd-media-keys"
+		application.language = "en_US.UTF-8"
+		window.x11.display = ":0"
+		application.process.machine_id = "d565935cdbf64125b679eb560a79c787"
+		application.process.session_id = "2"
+
+Client #71
+	Driver: protocol-native.c
+	Owner Module: 11
+	Properties:
+		application.name = "gsd-power"
+		native-protocol.peer = "UNIX socket client"
+		native-protocol.version = "32"
+		window.x11.display = ":0"
+		window.x11.screen = "0"
+		application.process.id = "2488"
+		application.process.user = "u"
+		application.process.host = "u-ThinkPad-X13-Gen-1"
+		application.process.binary = "gsd-power"
+		application.language = "en_US.UTF-8"
+		application.process.machine_id = "d565935cdbf64125b679eb560a79c787"
+		application.process.session_id = "2"
+
+Client #352
+	Driver: protocol-native.c
+	Owner Module: 11
+	Properties:
+		application.name = "gsd-media-keys"
+		native-protocol.peer = "UNIX socket client"
+		native-protocol.version = "32"
+		window.x11.display = ":0"
+		window.x11.screen = "0"
+		application.process.id = "2544"
+		application.process.user = "u"
+		application.process.host = "u-ThinkPad-X13-Gen-1"
+		application.process.binary = "gsd-media-keys"
+		application.language = "en_US.UTF-8"
+		application.process.machine_id = "d565935cdbf64125b679eb560a79c787"
+		application.process.session_id = "2"
+
+Client #578
+	Driver: protocol-native.c
+	Owner Module: 11
+	Properties:
+		application.name = "pactl"
+		native-protocol.peer = "UNIX socket client"
+		native-protocol.version = "32"
+		application.process.id = "8383"
+		application.process.user = "u"
+		application.process.host = "u-ThinkPad-X13-Gen-1"
+		application.process.binary = "pactl"
+		application.language = "en_US.UTF-8"
+		window.x11.display = ":0"
+		application.process.machine_id = "d565935cdbf64125b679eb560a79c787"
+		application.process.session_id = "2"
+
+Sample #0
+	Name: bell.ogg
+	Sample Specification: float32le 1ch 44100Hz
+	Channel Map: mono
+	Volume: (invalid)
+	        balance 0.00
+	Duration: 0.2s
+	Size: 34.5 KiB
+	Lazy: no
+	Filename: n/a
+	Properties:
+		media.role = "event"
+		media.name = "bell.ogg"
+		application.name = "pactl"
+		native-protocol.peer = "UNIX socket client"
+		native-protocol.version = "32"
+		application.process.id = "2528"
+		application.process.user = "u"
+		application.process.host = "u-ThinkPad-X13-Gen-1"
+		application.process.binary = "pactl"
+		application.language = "en_US.UTF-8"
+		window.x11.display = ":0"
+		application.process.machine_id = "d565935cdbf64125b679eb560a79c787"
+		application.process.session_id = "2"
+
+Sample #1
+	Name: bell-window-system
+	Sample Specification: s16le 1ch 44100Hz
+	Channel Map: mono
+	Volume: (invalid)
+	        balance 0.00
+	Duration: 0.2s
+	Size: 17.2 KiB
+	Lazy: no
+	Filename: n/a
+	Properties:
+		media.role = "event"
+		application.process.id = "2709"
+		application.name = "gnome-terminal-server"
+		event.description = "Bell event"
+		event.id = "bell-window-system"
+		media.name = "bell-window-system"
+		media.filename = "/usr/share//sounds/ubuntu/stereo/bell.ogg"
+		native-protocol.peer = "UNIX socket client"
+		native-protocol.version = "32"
+		application.id = "org.gnome.Shell"
+		application.icon_name = "start-here"
+		application.language = "en_US.UTF-8"
+		window.x11.screen = "0"
+		window.x11.display = ":0"
+		application.process.user = "u"
+		application.process.host = "u-ThinkPad-X13-Gen-1"
+		application.process.binary = "gnome-shell"
+		application.process.machine_id = "d565935cdbf64125b679eb560a79c787"
+		application.process.session_id = "2"
+
+Sample #2
+	Name: screen-capture
+	Sample Specification: s16le 2ch 96000Hz
+	Channel Map: front-left,front-right
+	Volume: (invalid)
+	        balance 0.00
+	Duration: 0.9s
+	Size: 327.1 KiB
+	Lazy: no
+	Filename: n/a
+	Properties:
+		media.role = "event"
+		event.description = "Screenshot taken"
+		event.id = "screen-capture"
+		media.name = "screen-capture"
+		media.filename = "/usr/share//sounds/freedesktop/stereo/screen-capture.oga"
+		application.name = "gsd-media-keys"
+		native-protocol.peer = "UNIX socket client"
+		native-protocol.version = "32"
+		window.x11.display = ":0"
+		window.x11.screen = "0"
+		application.process.id = "2544"
+		application.process.user = "u"
+		application.process.host = "u-ThinkPad-X13-Gen-1"
+		application.process.binary = "gsd-media-keys"
+		application.language = "en_US.UTF-8"
+		application.process.machine_id = "d565935cdbf64125b679eb560a79c787"
+		application.process.session_id = "2"
+
+Card #0
+	Name: alsa_card.pci-0000_00_1f.3-platform-skl_hda_dsp_generic
+	Driver: module-alsa-card.c
+	Owner Module: 7
+	Properties:
+		alsa.card = "0"
+		alsa.card_name = "sof-skl_hda_card"
+		alsa.long_card_name = "LENOVO-20T2SIT004-ThinkPadX13Gen1-20T2SIT004"
+		alsa.driver_name = "snd_soc_skl_hda_dsp"
+		device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic"
+		sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0"
+		device.bus = "pci"
+		device.vendor.id = "8086"
+		device.vendor.name = "Intel Corporation"
+		device.product.id = "02c8"
+		device.string = "0"
+		device.description = "sof-skl_hda_card"
+		module-udev-detect.discovered = "1"
+		device.icon_name = "audio-card-pci"
+	Profiles:
+		Hdmi3: Play to Hdmi3 (sinks: 1, sources: 2, priority: 1000, available: yes)
+		Hdmi2: Play to Hdmi2 (sinks: 1, sources: 2, priority: 1000, available: yes)
+		Hdmi1: Play to Hdmi1 (sinks: 1, sources: 2, priority: 1000, available: yes)
+		HiFi: Play HiFi Music (sinks: 1, sources: 2, priority: 8000, available: yes)
+		off: Off (sinks: 0, sources: 0, priority: 0, available: yes)
+	Active Profile: Hdmi2
+	Ports:
+		[Out] HDMI3: HDMI3/DP3 Output (priority: 500, latency offset: 0 usec, not available)
+			Part of profile(s): Hdmi3
+		[In] Dmic: Digital Microphone (priority: 100, latency offset: 0 usec)
+			Part of profile(s): Hdmi3, Hdmi2, Hdmi1, HiFi
+		[In] Headset Microphone: Headset Microphone (priority: 100, latency offset: 0 usec, not available)
+			Part of profile(s): Hdmi3, Hdmi2, Hdmi1, HiFi
+		[Out] HDMI2: HDMI2/DP2 Output (priority: 400, latency offset: 0 usec, available)
+			Part of profile(s): Hdmi2
+		[Out] HDMI1: HDMI1/DP1 Output (priority: 300, latency offset: 0 usec, not available)
+			Part of profile(s): Hdmi1
+		[Out] Headphone: Headphone (priority: 200, latency offset: 0 usec, not available)
+			Part of profile(s): HiFi
+		[Out] Speaker: Speaker (priority: 100, latency offset: 0 usec)
+			Part of profile(s): HiFi
diff --git a/checkbox_support/parsers/tests/pactl_data/sinks-desktop-bionic-x13.txt b/checkbox_support/parsers/tests/pactl_data/sinks-desktop-bionic-x13.txt
 new file mode 100644
index 0000000..5c90e9e
--- /dev/null
+++ b/checkbox_support/parsers/tests/pactl_data/sinks-desktop-bionic-x13.txt
@@ -0,0 +1,50 @@
+Sink #42
+	State: SUSPENDED
+	Name: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.Hdmi2__hw_sofsklhdacard_4__sink
+	Description: sof-skl_hda_card HDMI2/DP2 Output
+	Driver: module-alsa-card.c
+	Sample Specification: s16le 2ch 48000Hz
+	Channel Map: front-left,front-right
+	Owner Module: 7
+	Mute: no
+	Volume: front-left: 65536 / 100% / 0.00 dB,   front-right: 65536 / 100% / 0.00 dB
+	        balance 0.00
+	Base Volume: 65536 / 100% / 0.00 dB
+	Monitor Source: alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.Hdmi2__hw_sofsklhdacard_4__sink.monitor
+	Latency: 0 usec, configured 0 usec
+	Flags: HARDWARE DECIBEL_VOLUME LATENCY 
+	Properties:
+		alsa.resolution_bits = "16"
+		device.api = "alsa"
+		device.class = "sound"
+		alsa.class = "generic"
+		alsa.subclass = "generic-mix"
+		alsa.name = ""
+		alsa.id = "HDMI2 (*)"
+		alsa.subdevice = "0"
+		alsa.subdevice_name = "subdevice #0"
+		alsa.device = "4"
+		alsa.card = "0"
+		alsa.card_name = "sof-skl_hda_card"
+		alsa.long_card_name = "LENOVO-20T2SIT004-ThinkPadX13Gen1-20T2SIT004"
+		alsa.driver_name = "snd_soc_skl_hda_dsp"
+		device.bus_path = "pci-0000:00:1f.3-platform-skl_hda_dsp_generic"
+		sysfs.path = "/devices/pci0000:00/0000:00:1f.3/skl_hda_dsp_generic/sound/card0"
+		device.bus = "pci"
+		device.vendor.id = "8086"
+		device.vendor.name = "Intel Corporation"
+		device.product.id = "02c8"
+		device.string = "hw:sofsklhdacard,4"
+		device.buffering.buffer_size = "65472"
+		device.buffering.fragment_size = "16320"
+		device.access_mode = "mmap+timer"
+		device.profile.name = "Hdmi2: hw:sofsklhdacard,4: sink"
+		device.profile.description = "HDMI2/DP2 Output"
+		device.description = "sof-skl_hda_card HDMI2/DP2 Output"
+		module-udev-detect.discovered = "1"
+		device.icon_name = "audio-card-pci"
+	Ports:
+		[Out] HDMI2: HDMI2/DP2 Output (priority: 400, available)
+	Active Port: [Out] HDMI2
+	Formats:
+		pcm
diff --git a/checkbox_support/parsers/tests/test_pactl.py b/checkbox_support/parsers/tests/test_pactl.py
index 31f9071..876d3d9 100644
--- a/checkbox_support/parsers/tests/test_pactl.py
+++ b/checkbox_support/parsers/tests/test_pactl.py
@@ -157,7 +157,6 @@ class PropertyTests(ParsingTestCase):
         self.assertEqual(prop.name, 'module-udev-detect.discovered')
         self.assertEqual(prop.value, '1')
 
-
 class PortTests(ParsingTestCase):
 
     def test_port(self):
@@ -192,6 +191,17 @@ class PortTests(ParsingTestCase):
         self.assertEqual(port.priority, 9900)
         self.assertEqual(port.availability, '')
 
+    def test_DMIC_port_with_blank_space(self):
+        port = self.assertParses(
+            pactl.Port.Syntax, (
+                '[In] Headset Microphone: Headset Microphone '
+                '(priority: 100, not available)')
+        )['port']
+        self.assertEqual(port.name, 'Headset Microphone')
+        self.assertEqual(port.label, 'Headset Microphone')
+        self.assertEqual(port.priority, 100)
+        self.assertEqual(port.availability, 'not available')
+
     def test_chinese_label(self):
         port = self.assertParses(
             pactl.Port.Syntax, (
@@ -580,6 +590,21 @@ class RecordTests(ParsingTestCase, PactlDataMixIn):
         self.assertEqual(
             record.attribute_map['Formats'].value, ['pcm'])
 
+    def test_DMIC_sinks(self):
+        record = self.assertParses(
+            pactl.Record.Syntax, self.get_text("sinks-desktop-bionic-x13")
+        )['record']
+        self.assertEqual(record.name, "Sink #42")
+        self.assertEqual(record.attribute_list[0].name, "State")
+        self.assertIs(record.attribute_map['State'], record.attribute_list[0])
+        # Probe some random things
+        self.assertEqual(
+            record.attribute_map['Ports'].value[0].name, "HDMI2")
+        self.assertEqual(
+            record.attribute_map['Properties'].value[2].value, "sound")
+        self.assertEqual(
+            record.attribute_map['Formats'].value, ['pcm'])
+
     def test_modules(self):
         record = self.assertParses(
             pactl.Record.Syntax, self.get_text("modules-desktop-precise-0")
@@ -633,6 +658,12 @@ class DocumentTests(ParsingTestCase, PactlDataMixIn):
         )[0]
         self.assertEqual(len(document.record_list), 34)
 
+    def test_DMIC_pactl_list_cards_x13(self):
+        document = self.assertParses(
+            pactl.Document.Syntax, self.get_text("cards-desktop-bionic-x13")
+        )[0]
+        self.assertEqual(len(document.record_list), 1)
+
     def test_pactl_list_clients_bionic(self):
         document = self.assertParses(
             pactl.Document.Syntax, self.get_text("desktop-bionic-t480s")
diff --git a/checkbox_support/scripts/audio_settings.py b/checkbox_support/scripts/audio_settings.py
index f1ea9b7..f850e5a 100644
--- a/checkbox_support/scripts/audio_settings.py
+++ b/checkbox_support/scripts/audio_settings.py
@@ -74,7 +74,7 @@ def _guess_hdmi_profile(pactl_list):
         card = re.sub('.*#', '', record.name)  # save the card id
         ports = [
             p for p in record.attribute_map['Ports'].value
-            if 'HDMI / DisplayPort' in p.label]
+            if ('HDMI' in p.label) and (('DisplayPort' in p.label) or ('DP' in p.label))]
         if not ports:
             continue
         if [p for p in ports if p.availability]:
@@ -115,7 +115,7 @@ def _guess_hdmi_profile(pactl_list):
         card, port = available_port.popitem()
         # Keep the shortest string in the profile_list including 'stereo'
         # it will avoid testing 'surround' profiles
-        profile = min([p for p in port.profile_list if 'stereo' in p], key=len)
+        profile = min([p for p in port.profile_list if ('stereo' in p) or ('Hdmi' in p)], key=len)
         logging.info("[ Selected profile ]".center(80, '='))
         logging.info("Card #{} Profile: {}".format(card, profile))
         return (card, profile)
diff --git a/checkbox_support/scripts/tests/test_audio_settings.py b/checkbox_support/scripts/tests/test_audio_settings.py
index dc98084..9f81f97 100644
--- a/checkbox_support/scripts/tests/test_audio_settings.py
+++ b/checkbox_support/scripts/tests/test_audio_settings.py
@@ -155,6 +155,21 @@ class SetProfileTest(unittest.TestCase, PactlDataMixIn):
                 "desktop-raring-t430s-dp-available")),
             ('2', 'output:hdmi-stereo'))
 
+    def test_desktop_bionic_x13(self):
+        """
+        Bionic system with a Intel UHD Graphics chipset, it's DMIC system.
+        HDMI1, HDMI2 and HDMI3 are present in the card ports list, HDMI2 shown in the sinks list.
+        DMIC don't use "HDMI / DisplayPort " as keyword, now we use "HDMI" and "DP" keywords to find output port.
+        And in profile, there are not "hdmi-stereo" keyword any more, now we use "Hdmi".
+            Ports:
+        [...]
+                [Out] HDMI2: HDMI2/DP2 Output (priority: 400, latency offset: 0 usec, available)
+                    Part of profile(s): Hdmi2
+        """
+        self.assertEqual(
+            _guess_hdmi_profile(self.get_text("desktop-bionic-x13")),
+            ('0', 'Hdmi2'))
+
 class RegexTest(unittest.TestCase):
     
     def test_volume_regex_trusty(self):