[Python-apps-commits] r13770 - in packages/plainbox-provider-checkbox/trunk/debian (3 files)

[spineau-guest at users.alioth.debian.org]

    Date: Wednesday, December 7, 2016 @ 11:34:32
  Author: spineau-guest
Revision: 13770

debian/control, debian/patches: Drop pm-utils

Added:
  packages/plainbox-provider-checkbox/trunk/debian/patches/drop-pm-utils
Modified:
  packages/plainbox-provider-checkbox/trunk/debian/changelog
  packages/plainbox-provider-checkbox/trunk/debian/control

Modified: packages/plainbox-provider-checkbox/trunk/debian/changelog
===================================================================
--- packages/plainbox-provider-checkbox/trunk/debian/changelog	2016-12-07 11:23:06 UTC (rev 13769)
+++ packages/plainbox-provider-checkbox/trunk/debian/changelog	2016-12-07 11:34:32 UTC (rev 13770)
@@ -1,3 +1,10 @@
+plainbox-provider-checkbox (0.25-2) unstable; urgency=medium
+
+  * debian/patches: Drop pm-utils (the provider scripts will use systemd 
+    services).
+
+ -- Sylvain Pineau <sylvain.pineau at canonical.com>  Wed, 07 Dec 2016 10:15:54 +0100
+
 plainbox-provider-checkbox (0.25-1) unstable; urgency=medium
 
   * New upstream maintenance release

Modified: packages/plainbox-provider-checkbox/trunk/debian/control
===================================================================
--- packages/plainbox-provider-checkbox/trunk/debian/control	2016-12-07 11:23:06 UTC (rev 13769)
+++ packages/plainbox-provider-checkbox/trunk/debian/control	2016-12-07 11:34:32 UTC (rev 13770)
@@ -30,7 +30,6 @@
             gstreamer1.0-plugins-good,
             gstreamer1.0-pulseaudio,
             libgstreamer1.0-0,
-            pm-utils,
             python3-apt,
             python3-dbus,
             python3-gi,

Added: packages/plainbox-provider-checkbox/trunk/debian/patches/drop-pm-utils
===================================================================
--- packages/plainbox-provider-checkbox/trunk/debian/patches/drop-pm-utils	                        (rev 0)
+++ packages/plainbox-provider-checkbox/trunk/debian/patches/drop-pm-utils	2016-12-07 11:34:32 UTC (rev 13770)
@@ -0,0 +1,83 @@
+--- a/bin/graphics_stress_test
++++ b/bin/graphics_stress_test
+@@ -117,15 +117,11 @@
+     def do_suspend(self, mode):
+         '''
+         Suspend the system and hope it wakes up.
+-        Previously tried writing new state to /sys/power/state but that
+-        seems to put the system into an uncrecoverable S3 state.  So far,
+-        pm-suspend seems to be the most reliable way to go.
+-
+         '''
+         if mode == 'mem':
+-            status = call('/usr/sbin/pm-suspend')
++            status = call(['systemctl', 'suspend'])
+         elif mode == 'disk':
+-            status = call('/usr/sbin/pm-hibernate')
++            status = call(['systemctl', 'hibernate'])
+         else:
+             logging.debug('Unknown sleep state passed')
+             status == 1
+--- a/bin/sleep_test
++++ b/bin/sleep_test
+@@ -132,10 +132,6 @@
+     def DoSuspend(self, mode):
+         '''
+         Suspend the system and hope it wakes up.
+-        Previously tried writing new state to /sys/power/state but that
+-        seems to put the system into an uncrecoverable S3 state.  So far,
+-        pm-suspend seems to be the most reliable way to go.
+-
+         '''
+         # Set up our start and finish markers
+         self.time_stamp = self.GetCurrentTime()
+@@ -144,9 +140,9 @@
+         self.MarkLog(self.start_marker)
+ 
+         if mode == 'mem':
+-            status = call('/usr/sbin/pm-suspend')
++            status = call(['systemctl', 'suspend'])
+         elif mode == 'disk':
+-            status = call('/usr/sbin/pm-hibernate')
++            status = call(['systemctl', 'hibernate'])
+         else:
+             logging.debug('Unknown sleep state passed: %s' % mode)
+             status == 1
+@@ -154,7 +150,7 @@
+         if status == 0:
+             logging.debug('Successful suspend')
+         else:
+-            logging.debug('Error while running pm-suspend')
++            logging.debug('Error while running suspend command')
+         self.MarkLog(self.end_marker)
+ 
+     def GetResults(self, mode, perf):
+--- a/jobs/suspend.txt.in
++++ b/jobs/suspend.txt.in
+@@ -305,7 +305,7 @@
+  id: suspend/`echo ${index}`_hybrid_sleep_`echo "${product}" | sed 's/ /_/g;s/[^_a-zA-Z0-9-]//g'`
+  user: root
+  command:
+-  set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single -s s3 --s3-hybrid --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 --pm-method=pm-utils | tee $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single_times.log
++  set -o pipefail; fwts_test -f none -l $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single -s s3 --s3-hybrid --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/`echo ${index}`_hybrid_sleep_single_times.log
+  estimated_duration: 90.0
+  _description:
+   PURPOSE:
+@@ -409,7 +409,7 @@
+ user: root
+ depends: suspend/suspend_advanced
+ estimated_duration: 120.0
+-command: pm-suspend
++command: systemctl suspend
+ _description:
+  PURPOSE:
+      Wake up by USB keyboard
+@@ -426,7 +426,7 @@
+ user: root
+ depends: suspend/suspend_advanced
+ estimated_duration: 120.0
+-command: pm-suspend
++command: systemctl suspend
+ _description:
+  PURPOSE:
+      Wake up by USB mouse