More shell fixes

pull/6460/head
Michael DeHaan 11 years ago
parent 6067d826e4
commit dac90278db

@ -105,7 +105,7 @@ except ImportError:
def ring_check(module, riak_admin_bin): def ring_check(module, riak_admin_bin):
cmd = '%s ringready 2> /dev/null' % riak_admin_bin cmd = '%s ringready' % riak_admin_bin
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
if rc == 0 and 'TRUE All nodes agree on the ring' in out: if rc == 0 and 'TRUE All nodes agree on the ring' in out:
return True return True
@ -221,7 +221,7 @@ def main():
if wait_for_handoffs: if wait_for_handoffs:
timeout = time.time() + wait_for_handoffs timeout = time.time() + wait_for_handoffs
while True: while True:
cmd = '%s transfers 2> /dev/null' % riak_admin_bin cmd = '%s transfers' % riak_admin_bin
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
if 'No transfers active' in out: if 'No transfers active' in out:
result['handoffs'] = 'No transfers active.' result['handoffs'] = 'No transfers active.'

Loading…
Cancel
Save