openstack/swift
Code Issues Proposed changes

Merge "capture resetswift output in probetests"

Browse Source
This commit is contained in:
Jenkins 2012-12-10 17:19:04 +00:00 committed by Gerrit Code Review
commit a6ee9b446d
1 changed files with 4 additions and 2 deletions

6
test/probe/common.py

@ -16,7 +16,7 @@
from httplib import HTTPConnection from httplib import HTTPConnection
from os import kill from os import kill
from signal import SIGTERM from signal import SIGTERM
from subprocess import call, Popen from subprocess import Popen, PIPE, STDOUT
from time import sleep, time from time import sleep, time
from swiftclient import get_auth, head_account from swiftclient import get_auth, head_account
@ -124,7 +124,9 @@ def kill_nonprimary_server(primary_nodes, port2server, pids):
def reset_environment(): def reset_environment():
call(['resetswift']) p = Popen("resetswift 2>&1", shell=True, stdout=PIPE)
stdout, _stderr = p.communicate()
print stdout
pids = {} pids = {}
try: try:
port2server = {} port2server = {}