summaryrefslogtreecommitdiff
path: root/bin
diff options
authorZygmunt Krynicki <zygmunt.krynicki@canonical.com>2015-01-22 10:07:34 +0000
committerDaniel Manrique <>2015-01-22 10:07:34 +0000
commit88567352cd782a54a4cbb936495077bdc7738e12 (patch)
tree458b3770d979c522849d4afe8f5291ed1507ac0b /bin
parent70b437a3c9c7e8fd2e1dc4fc736e7c9ab7a67b45 (diff)
parent06419c51bc91209904bc18904eb23000ab04ddbb (diff)
"automatic merge of lp:~zkrynicki/checkbox/fix-1413134/ by tarmac [r=kissiel][bug=1413134][author=zkrynicki]"
Diffstat (limited to 'bin')
-rwxr-xr-xbin/pm_test7
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/pm_test b/bin/pm_test
index 372ecb2..827758f 100755
--- a/bin/pm_test
+++ b/bin/pm_test
@@ -7,6 +7,7 @@ import re
import shutil
import subprocess
import sys
+import signal
from argparse import ArgumentParser, SUPPRESS
from calendar import timegm
@@ -143,7 +144,11 @@ class PowerManagementOperation(object):
logging.info('Executing new {0!r} operation...'
.format(self.args.pm_operation))
logging.debug('Executing: {0!r}...'.format(command_str))
- subprocess.Popen(command_str, shell=True)
+ # The PM operation is performed asynchronously so let's just wait
+ # indefinitely until it happens and someone comes along to kill us.
+ # This addresses LP: #1413134
+ subprocess.check_call(command_str, shell=True)
+ signal.pause()
def summary(self):
"""