Skip to content

fix the wrong file name pactl.sh to pactl_list.sh (Bugfix)#947

Merged
Hook25 merged 1 commit intocanonical:mainfrom
eugene-yujinwu:fix_pactl_list_typo
Jan 19, 2024
Merged

fix the wrong file name pactl.sh to pactl_list.sh (Bugfix)#947
Hook25 merged 1 commit intocanonical:mainfrom
eugene-yujinwu:fix_pactl_list_typo

Conversation

@eugene-yujinwu
Copy link
Copy Markdown
Contributor

@eugene-yujinwu eugene-yujinwu commented Jan 18, 2024

Description

The pactl.sh should be a typo which introduced by the commit 228b716 :

@@ -654,9 +773,13 @@ category_id: com.canonical.plainbox::audio
 id: audio/detect_sinks_sources_after_suspend_30_cycles
 estimated_duration: 1.0
 requires:
-  package.name == 'pulseaudio-utils'
+ package.name in ['pulseaudio-utils', 'pipewire']
 command:
-  pactl_list.sh
+  if check_audio_deamon.sh ; then
+    pipewire_utils.py detect -t audio -c sinks
+  else
+    pactl.sh sinks
+  fi

There is not such a file named pactl.sh.

When run the tests:
checkbox-cli run com.canonical.certification::audio/detect_sinks_sources_after_suspend_30_cycles:

==============[ Running job 2 / 2. Estimated time left: 0:00:01 ]===============
-------------[ audio/detect_sinks_sources_after_suspend_30_cycles ]-------------
ID: com.canonical.certification::audio/detect_sinks_sources_after_suspend_30_cycles
Category: com.canonical.plainbox::audio
... 8< -------------------------------------------------------------------------
Daemon is pulseaudio, use pulseaudio function
bash: line 4: pactl.sh: command not found
------------------------------------------------------------------------- >8 ---
Outcome: job failed

Resolved issues

A typo introduced by #826

Documentation

NA

Tests

After side load the fix, the test results look like this:

==============[ Running job 2 / 2. Estimated time left: 0:00:01 ]===============
-------------[ audio/detect_sinks_sources_after_suspend_30_cycles ]-------------
ID: com.canonical.certification::audio/detect_sinks_sources_after_suspend_30_cycles
Category: com.canonical.plainbox::audio
... 8< -------------------------------------------------------------------------
Daemon is pulseaudio, use pulseaudio function
1	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_5__sink	module-alsa-card.c	s16le 2ch 48000Hz	SUSPENDED
2	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_4__sink	module-alsa-card.c	s16le 2ch 48000Hz	SUSPENDED
3	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp_3__sink	module-alsa-card.c	s16le 2ch 48000Hz	SUSPENDED
4	alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink	module-alsa-card.c	s16le 2ch 48000Hz	SUSPENDED
------------------------------------------------------------------------- >8 ---
Outcome: job passed
Finalizing session that hasn't been submitted anywhere: checkbox-run-2024-01-18T08.46.21
==================================[ Results ]===================================
 ☑ : Collect information about installed software packages
 ☑ : audio/detect_sinks_sources_after_suspend_30_cycles

@codecov
Copy link
Copy Markdown

codecov bot commented Jan 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f31e500) 39.18% compared to head (ccaf272) 39.18%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #947   +/-   ##
=======================================
  Coverage   39.18%   39.18%           
=======================================
  Files         315      315           
  Lines       34899    34899           
  Branches     5972     5972           
=======================================
  Hits        13676    13676           
  Misses      20610    20610           
  Partials      613      613           
Flag Coverage Δ
provider-base 10.19% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Copy Markdown
Collaborator

@Hook25 Hook25 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, ty for fixing this

@Hook25 Hook25 merged commit 9fbbf7b into canonical:main Jan 19, 2024
LiaoU3 pushed a commit to LiaoU3/checkbox that referenced this pull request Mar 20, 2024
…nical#947)

fix(provider-base): a typo made pactl_list.sh as pactl.sh
binli pushed a commit to binli/checkbox that referenced this pull request Mar 22, 2024
…nical#947)

fix(provider-base): a typo made pactl_list.sh as pactl.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants