Merge ~sylvain-pineau/plainbox-provider-checkbox:fix-1794644-s2idle into plainbox-provider-checkbox:master

[Sylvain Pineau]

Update pm_test to also count s2idle markers in fwts.log, see commit msg for more details.

[Sheila Miguez (codersquid)]

Will old platforms still pass?

[Sylvain Pineau (sylvain-pineau)]

yes, the /sys/power/mem_sleep is either deep (s3) or s2idle. The total of iterations is taken into account both so the test will continue to work on both old and new platforms.

[Sheila Miguez (codersquid)]

lgtm

review: Approve

diff --git a/bin/pm_test b/bin/pm_test
index 1ac0c53..b03e680 100755
--- a/bin/pm_test
+++ b/bin/pm_test
@@ -256,8 +256,12 @@ class PowerManagementOperation():
             fwts_log_path = os.path.join(self.args.log_dir, 'fwts.log')
             try:
                 with open(fwts_log_path, 'rt') as f:
-                    magic_line = 'Completed S3 cycle(s) \n'
-                    count = f.readlines().count(magic_line)
+                    magic_line_s3 = 'Completed S3 cycle(s) \n'
+                    magic_line_s2idle = 'Completed s2idle cycle(s) \n'
+                    lines = f.readlines()
+                    count_s3 = lines.count(magic_line_s3)
+                    count_s2idle = lines.count(magic_line_s2idle)
+                    count = count_s3 + count_s2idle
                     if count != total_suspends_expected:
                         problems = (
                             "Found {} occurrences of '{}'. Expected {}".format(