Merge ~ycheng-twn/plainbox-provider-pc-sanity/+git/plainbox-provider-pc-sanity:0001_fix_long_idle_test into plainbox-provider-pc-sanity:master

[Yuan-Chen Cheng]

pc-sanity-power-consumption.pxu: fix a issue that long idle always passed, and also failed if requirement neither exists nor can be installed.

[Yuan-Chen Cheng (ycheng-twn)]

test on machine that kernel from proposed channel, and source list does not have proposed channel, it will failed.

test on machine that can't go pc10, then it does failed.

[Kai-Chuan Hsieh (kchsieh)]

LGTM.

review: Approve

[Alex Tu (alextu)]

comment inline
it was there before up is to check if there shows pc10 during long idle.
Not checked, but will it still show PC10 values record in long idle after system up from long idle?
Did you test this logic on machines which long idle can deep to pc10?

review: Needs Information

[Yuan-Chen Cheng (ycheng-twn)]

A1: yes, because the output goes to different place, and the grep check previous output.

A2: fix the bug that per test, it properly failed on the failed machine and pass on ok machine.

review: Needs Resubmitting

[Alex Tu (alextu)]

sorry, I don't get the idea of moving the checking from 'before' system up to 'after' system up.
The result is expected to the same.

review: Needs Information

[Yuan-Chen Cheng (ycheng-twn)]

only the return value of the last command means.

Please test by creating a job that's

 true
 false
 ------------
 false
 true

separately and test it.

[Alex Tu (alextu)]

comment in line

[Yuan-Chen Cheng (ycheng-twn)]

modify per request.

review: Needs Resubmitting

[Yuan-Chen Cheng (ycheng-twn)]

tested in a machine that can't pass c10, and it does fail.
tested in a machine that can pass c10, and it does pass.

[Alex Tu (alextu)]

thanks! LGTM

review: Approve

diff --git a/debian/changelog b/debian/changelog
index e1b9159..6e237f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-plainbox-provider-pc-sanity (0.2.7ubuntu1) UNRELEASED; urgency=medium
+plainbox-provider-pc-sanity (0.2.8) UNRELEASED; urgency=medium
 
-  [Kai-Chuan Hsieh]
+  [ Kai-Chuan Hsieh ]
   * Add job to check if thermald is active.
 
   [Alex Tu]
   * remove turbostat checking for shortidle
 
- -- Kai-Chuan Hsieh <[e-mail]>  Thu, 30 Apr 2020 15:50:35 +0800
+  [ Yuan-Chen Cheng ]
+  * pc-sanity-power-consumption.pxu: fix issues that long idle always passed,
+    and also failed if requirements neither exists nor can be installed.
+
+ -- Yuan-Chen Cheng <[e-mail]>  Thu, 18 Jun 2020 15:02:17 +0800
 
 plainbox-provider-pc-sanity (0.2.7) bionic; urgency=medium
 
diff --git a/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-power-consumption.pxu b/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-power-consumption.pxu
index d7726a9..ce90233 100644
--- a/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-power-consumption.pxu
+++ b/usr/share/plainbox-provider-checkbox/units/pc-sanity/pc-sanity-power-consumption.pxu
@@ -29,8 +29,8 @@ command:
  set -x
  report_folder="$HOME/submission-report-$(date +%Y%m%d%H%M)"
  mkdir -p "$report_folder"
- dpkg -s linux-tools-"$(uname -r)" || sudo apt-get install -y linux-tools-"$(uname -r)"
- dpkg -s xautomation || sudo apt-get install -y xautomation
+ dpkg -s linux-tools-"$(uname -r)" || sudo apt-get install -y linux-tools-"$(uname -r)" || exit 1
+ dpkg -s xautomation || sudo apt-get install -y xautomation || exit 1
  gsettings set org.gnome.desktop.session idle-delay 10
  sleep 10
  for i in $(sudo turbostat --list | sed 's/,/ /g'); do
@@ -44,9 +44,10 @@ command:
          fi;
  done;
  sudo turbostat --num_iterations 20 --show "$COL" 2>&1 | tee "$report_folder"/turbostat-pkgpc-longidle.log
- tail -n1 "$report_folder"/turbostat-pkgpc-longidle.log | grep "0.00$" && false
  DISPLAY=:0 xte 'key Up'
  gsettings set org.gnome.desktop.session idle-delay 0
+ # set false in the end when it failed so that test case be marked as failed.
+ ! (tail -n1 "$report_folder"/turbostat-pkgpc-longidle.log | grep "0.00$")
 _summary: check if target machine can get cpu pkg c10 in long idle.
 _description:
  check if target machine can get cpu pkg c10 in long idle. detail history: https://trello.com/c/3C0b5Nkt