diff options
Diffstat (limited to 'tests/topotests/lib/common_config.py')
| -rw-r--r-- | tests/topotests/lib/common_config.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py index 0598a154dd..d2c1d82430 100644 --- a/tests/topotests/lib/common_config.py +++ b/tests/topotests/lib/common_config.py @@ -21,6 +21,8 @@ from collections import OrderedDict from datetime import datetime from time import sleep +from subprocess import call +from subprocess import STDOUT as SUB_STDOUT import StringIO import os import ConfigParser @@ -233,7 +235,7 @@ def reset_config_on_routers(tgen, routerName=None): command = "/usr/lib/frr/frr-reload.py --input {}/{}/frr.sav" \ " --test {}/{}/frr_json_initial.conf > {}". \ format(TMPDIR, rname, TMPDIR, rname, dname) - result = os.system(command) + result = call(command, shell=True, stderr=SUB_STDOUT) # Assert if command fail if result > 0: @@ -359,7 +361,6 @@ def start_topology(tgen): os.chdir('{}/{}'.format(TMPDIR, rname)) os.system('touch zebra.conf bgpd.conf') - except IOError as (errno, strerror): logger.error("I/O error({0}): {1}".format(errno, strerror)) |