capture resetswift output in probetests

Code Issues Proposed changes

This change makes the dots prettier during probetests
When calling the resetswift script, the probetests will use subprocess
to redirect stderr to stdout and capture stdout into a buffer. We print
the captured buffer from resetswift's combined stdout/stderr and let
nosetests stdout capturing handle printing the output for debug only if a
test fails.
Change-Id: I022512f2ef5a4c43b0e49264bad1bca98c1f0299

This commit is contained in:

clayg

2012年11月26日 12:28:33 -08:00

parent 13937ad696

commit b852f2274b

1 changed files with 4 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6
test/probe/common.py

View File

@@ -16,7 +16,7 @@

from httplib import HTTPConnection

from os import kill

from signal import SIGTERM

from subprocess import call, Popen

from subprocess import Popen, PIPE, STDOUT

from time import sleep, time

from swiftclient import get_auth, head_account

@@ -122,7 +122,9 @@ def kill_nonprimary_server(primary_nodes, port2server, pids):

def reset_environment():

call(['resetswift'])

p = Popen("resetswift 2>&1", shell=True, stdout=PIPE)

stdout, _stderr = p.communicate()

print stdout

pids = {}

try:

port2server = {}

capture resetswift output in probetests

6 test/probe/common.py Unescape Escape View File

6
test/probe/common.py

View File