diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/base.py | 3 | ||||
| -rw-r--r-- | test/lib/quagga.py | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/test/lib/base.py b/test/lib/base.py index 3dcbc1e8..c0830a34 100644 --- a/test/lib/base.py +++ b/test/lib/base.py @@ -16,7 +16,7 @@ from fabric.api import local, lcd from fabric import colors from fabric.utils import indent -from fabric.state import env +from fabric.state import env, output import netaddr import os @@ -42,6 +42,7 @@ BGP_ATTR_TYPE_MP_REACH_NLRI = 14 BGP_ATTR_TYPE_EXTENDED_COMMUNITIES = 16 env.abort_exception = RuntimeError +output.stderr = False def try_several_times(f, t=3, s=1): e = None diff --git a/test/lib/quagga.py b/test/lib/quagga.py index 924a3a82..3cab7447 100644 --- a/test/lib/quagga.py +++ b/test/lib/quagga.py @@ -262,9 +262,4 @@ class QuaggaBGPContainer(BGPContainer): daemon.append('zebra') for d in daemon: cmd = '/usr/bin/pkill {0} -SIGHUP'.format(d) - m = self.local(cmd, capture=True) - return_code = getattr(m, 'return_code') - if return_code != 0: - errmsg = "ret_code:%s, stdout:%s, stderr:%s" % (return_code, getattr(m, 'stdout'), getattr(m, 'stderr')) - raise Exception('reload_config error. errmsg: %s' % errmsg) - + self.local(cmd, capture=True) |