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

moved ping test method into the emane test itself

Browse source
This commit is contained in:
bharnden 2019-09-11 13:16:09 -07:00
parent 3776e1dda7
commit 2a4ee68fd9
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/tests/conftest.py
View file

@ -188,11 +188,6 @@ def coreserver():
ServiceManager.services.clear() ServiceManager.services.clear()
def ping(from_node, to_node, ip_prefixes, count=3):
address = ip_prefixes.ip4_address(to_node)
return from_node.cmd(["ping", "-c", str(count), address])
def pytest_addoption(parser): def pytest_addoption(parser):
parser.addoption("--distributed", help="distributed server address") parser.addoption("--distributed", help="distributed server address")

6
daemon/tests/emane/test_emane.py
View file

@ -6,7 +6,6 @@ from xml.etree import ElementTree
import pytest import pytest
from conftest import ping
from core import CoreError from core import CoreError
from core.emane.bypass import EmaneBypassModel from core.emane.bypass import EmaneBypassModel
from core.emane.commeffect import EmaneCommEffectModel from core.emane.commeffect import EmaneCommEffectModel
@ -25,6 +24,11 @@ _EMANE_MODELS = [
_DIR = os.path.dirname(os.path.abspath(__file__)) _DIR = os.path.dirname(os.path.abspath(__file__))
def ping(from_node, to_node, ip_prefixes, count=3):
address = ip_prefixes.ip4_address(to_node)
return from_node.cmd(["ping", "-c", str(count), address])
class TestEmane: class TestEmane:
@pytest.mark.parametrize("model", _EMANE_MODELS) @pytest.mark.parametrize("model", _EMANE_MODELS)
def test_models(self, session, model, ip_prefixes): def test_models(self, session, model, ip_prefixes):