Merge branch 'master' into dev-greg

5 files changed, 0 insertions, 112 deletions

diff --git a/tests/models/network/__init__.py b/tests/models/network/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tests/models/network/__init__.py
+++ /dev/null
diff --git a/tests/models/network/test_mtr.py b/tests/models/network/test_mtr.py
deleted file mode 100644
index 2965300..0000000
--- a/tests/models/network/test_mtr.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from generalresearch.models.network.mtr.execute import execute_mtr
-import faker
-
-from generalresearch.models.network.tool_run import ToolName, ToolClass
-
-fake = faker.Faker()
-
-
-def test_execute_mtr(toolrun_manager):
-    ip = "65.19.129.53"
-
-    run = execute_mtr(ip=ip, report_cycles=3)
-    assert run.tool_name == ToolName.MTR
-    assert run.tool_class == ToolClass.TRACEROUTE
-    assert run.ip == ip
-    result = run.parsed
-
-    last_hop = result.hops[-1]
-    assert last_hop.asn == 6939
-    assert last_hop.domain == "grlengine.com"
-
-    last_hop_1 = result.hops[-2]
-    assert last_hop_1.asn == 6939
-    assert last_hop_1.domain == "he.net"
-
-    toolrun_manager.create_mtr_run(run)
diff --git a/tests/models/network/test_nmap.py b/tests/models/network/test_nmap.py
deleted file mode 100644
index a135a13..0000000
--- a/tests/models/network/test_nmap.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import subprocess
-
-import faker
-
-from generalresearch.managers.network.tool_run import ToolRunManager
-from generalresearch.models.network.definitions import IPProtocol
-from generalresearch.models.network.nmap.execute import execute_nmap
-from generalresearch.models.network.nmap.result import PortState
-from generalresearch.models.network.tool_run import ToolClass, ToolName
-
-fake = faker.Faker()
-
-
-def resolve(host: str):
-    return subprocess.check_output(["dig", host, "+short"]).decode().strip()
-
-
-def test_execute_nmap_scanme(toolrun_manager: ToolRunManager):
-    ip = resolve("scanme.nmap.org")
-
-    run = execute_nmap(ip=ip, top_ports=None, ports="20-30", enable_advanced=False)
-    assert run.tool_name == ToolName.NMAP
-    assert run.tool_class == ToolClass.PORT_SCAN
-    assert run.ip == ip
-    result = run.parsed
-
-    port22 = result._port_index[(IPProtocol.TCP, 22)]
-    assert port22.state == PortState.OPEN
-
-    toolrun_manager.create_nmap_run(run)
diff --git a/tests/models/network/test_nmap_parser.py b/tests/models/network/test_nmap_parser.py
deleted file mode 100644
index abc83c9..0000000
--- a/tests/models/network/test_nmap_parser.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-
-import pytest
-
-from generalresearch.models.network.nmap.parser import parse_nmap_xml
-
-@pytest.fixture
-def nmap_raw_output_2(request) -> str:
-    fp = os.path.join(request.config.rootpath, "data/nmaprun2.xml")
-    with open(fp) as f:
-        data = f.read()
-    return data
-
-
-def test_nmap_xml_parser(nmap_raw_output, nmap_raw_output_2):
-    n = parse_nmap_xml(nmap_raw_output)
-    assert n.tcp_open_ports == [61232]
-    assert len(n.trace.hops) == 18
-
-    n = parse_nmap_xml(nmap_raw_output_2)
-    assert n.tcp_open_ports == [22, 80, 9929, 31337]
-    assert n.trace is None
diff --git a/tests/models/network/test_rdns.py b/tests/models/network/test_rdns.py
deleted file mode 100644
index 5c3b024..0000000
--- a/tests/models/network/test_rdns.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import faker
-
-from generalresearch.managers.network.tool_run import ToolRunManager
-from generalresearch.models.network.rdns.execute import execute_rdns
-from generalresearch.models.network.tool_run import ToolClass, ToolName
-
-fake = faker.Faker()
-
-
-def test_execute_rdns_grl(toolrun_manager: ToolRunManager):
-    ip = "65.19.129.53"
-    run = execute_rdns(ip=ip)
-    assert run.tool_name == ToolName.DIG
-    assert run.tool_class == ToolClass.RDNS
-    assert run.ip == ip
-    result = run.parsed
-    assert result.primary_hostname == "in1-smtp.grlengine.com"
-    assert result.primary_domain == "grlengine.com"
-    assert result.hostname_count == 1
-
-    toolrun_manager.create_rdns_run(run)
-
-
-def test_execute_rdns_none(toolrun_manager: ToolRunManager):
-    ip = fake.ipv6()
-    run = execute_rdns(ip)
-    result = run.parsed
-
-    assert result.primary_hostname is None
-    assert result.primary_domain is None
-    assert result.hostname_count == 0
-    assert result.hostnames == []
-
-    toolrun_manager.create_rdns_run(run)