forked from p15670423/monkey
Removed pytest fail mark from fixed tunneling test and moved to performance test
This commit is contained in:
parent
1ed4b29786
commit
c8d8cc3941
|
@ -118,7 +118,6 @@ class TestMonkeyBlackbox(object):
|
||||||
def test_shellshock_exploiter(self, island_client):
|
def test_shellshock_exploiter(self, island_client):
|
||||||
TestMonkeyBlackbox.run_basic_test(island_client, "SHELLSHOCK.conf", "Shellschock_exploiter")
|
TestMonkeyBlackbox.run_basic_test(island_client, "SHELLSHOCK.conf", "Shellschock_exploiter")
|
||||||
|
|
||||||
@pytest.mark.xfail(reason="Test fails randomly - still investigating.")
|
|
||||||
def test_tunneling(self, island_client):
|
def test_tunneling(self, island_client):
|
||||||
TestMonkeyBlackbox.run_basic_test(island_client, "TUNNELING.conf", "Tunneling_exploiter", 15*60)
|
TestMonkeyBlackbox.run_basic_test(island_client, "TUNNELING.conf", "Tunneling_exploiter", 15*60)
|
||||||
|
|
||||||
|
@ -128,6 +127,7 @@ class TestMonkeyBlackbox(object):
|
||||||
def test_wmi_pth(self, island_client):
|
def test_wmi_pth(self, island_client):
|
||||||
TestMonkeyBlackbox.run_basic_test(island_client, "WMI_PTH.conf", "WMI_PTH")
|
TestMonkeyBlackbox.run_basic_test(island_client, "WMI_PTH.conf", "WMI_PTH")
|
||||||
|
|
||||||
|
@pytest.mark.xfail(reason="Performance is slow, will improve on release 1.9.")
|
||||||
def test_performance(self, island_client):
|
def test_performance(self, island_client):
|
||||||
"""
|
"""
|
||||||
This test includes the SSH + Elastic + Hadoop + MSSQL machines all in one test
|
This test includes the SSH + Elastic + Hadoop + MSSQL machines all in one test
|
||||||
|
|
Loading…
Reference in New Issue