Merge ~cyruslien/plainbox-provider-pc-sanity/+git/plainbox-provider-pc-sanity-2:fix-focal-build-fail into plainbox-provider-pc-sanity:master

Proposed by Cyrus Lien
Status: Merged
Approved by: Dirk Su
Approved revision: 27c9533c6e592c269520731094b547445eb8b8a7
Merged at revision: 279167e8ca3171a92576154e098f2fff1e454aa8
Proposed branch: ~cyruslien/plainbox-provider-pc-sanity/+git/plainbox-provider-pc-sanity-2:fix-focal-build-fail
Merge into: plainbox-provider-pc-sanity:master
Diff against target: 12 lines (+1/-0)
1 file modified
units/pc-sanity/pc-sanity-check-devices.pxu (+1/-0)
Reviewer Review Type Date Requested Status
Dirk Su Approve
Shih-Yuan Lee Approve
Review via email: mp+465746@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

I don't get it that we run shellcheck against pc-sanity-check-devices.pxu.

review: Needs Information
Revision history for this message
OEM Taipei Bot (oem-taipei-bot) wrote :
Revision history for this message
Cyrus Lien (cyruslien) wrote :

> I don't get it that we run shellcheck against pc-sanity-check-devices.pxu.
Here is the ppa build log https://launchpadlibrarian.net/728149971/buildlog_ubuntu-focal-amd64.plainbox-provider-pc-sanity_1.0.2-0~202405060919+e713912~ubuntu20.04.1_BUILDING.txt.gz

Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

OK. There is an inline shellcheck.

FAIL: test_job_command_units/pc-sanity/pc-sanity-check-devices.pxu:303-335_miscellanea/check-display_{product} (plainbox.provider_manager.InlineShellcheckTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/plainbox/provider_manager.py", line 1575, in run_inline_shellcheck
    self.assertEqual(result.returncode, 0)
AssertionError: 1 != 0

review: Approve
Revision history for this message
Dirk Su (dirksu) wrote (last edit ):
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/pc-sanity/pc-sanity-check-devices.pxu b/units/pc-sanity/pc-sanity-check-devices.pxu
2index ecc2028..5545cef 100644
3--- a/units/pc-sanity/pc-sanity-check-devices.pxu
4+++ b/units/pc-sanity/pc-sanity-check-devices.pxu
5@@ -309,6 +309,7 @@ plugin: shell
6 category_id: com.canonical.plainbox::miscellanea
7 id: miscellanea/check-display_{product}
8 command:
9+ # shellcheck disable=SC2230
10 UWAKE=$(which uwake) # sudo doesn't inherit current $PATH
11 sudo "$UWAKE" # src: c/uwake.c
12 sleep 5 # wait the screen to be on

Subscribers

People subscribed via source and target branches