afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed utils.cmd and related node functions

Browse source
This commit is contained in:
Blake Harnden 2019-10-10 23:01:16 -07:00
parent f6cdeb23de
commit c3d27eb8a5
7 changed files with 14 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/tests/test_core.py
View file

@ -10,6 +10,7 @@ import pytest
from core.emulator.emudata import NodeOptions
from core.emulator.enumerations import MessageFlags, NodeTypes
from core.errors import CoreCommandError
from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
from core.nodes.client import VnodeClient
@ -38,7 +39,12 @@ def createclients(sessiondir, clientcls=VnodeClient, cmdchnlfilterfunc=None):
def ping(from_node, to_node, ip_prefixes):
address = ip_prefixes.ip4_address(to_node)
return from_node.node_net_cmd(["ping", "-c", "3", address])
try:
from_node.node_net_cmd(["ping", "-c", "3", address])
status = 0
except CoreCommandError as e:
status = e.returncode
return status
class TestCore: