CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated network test to use unittest

Browse Source
This commit is contained in:
UpstreamData
2022-05-25 11:49:28 -06:00
parent 9eb2259aae
commit 6fbd9faffd
2 changed files with 45 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/__init__.py
View File

@@ -1,9 +1,7 @@
from tests.network_tests import test_network import unittest
from tests.network_tests import NetworkTest
def test_all():
test_network()
if __name__ == "__main__": if __name__ == "__main__":
test_all() unittest.main()

43
tests/network_tests/__init__.py
View File

@@ -1,10 +1,12 @@
import ipaddress import ipaddress
import unittest
from network.net_range import MinerNetworkRange from network.net_range import MinerNetworkRange
from network import MinerNetwork from network import MinerNetwork
def test_network(): class NetworkTest(unittest.TestCase):
def test_net_range(self):
net_range_str = "192.168.1.29, 192.168.1.40-192.168.1.43, 192.168.1.60" net_range_str = "192.168.1.29, 192.168.1.40-192.168.1.43, 192.168.1.60"
net_range_list = [ net_range_list = [
"192.168.1.29", "192.168.1.29",
@@ -14,18 +16,11 @@ def test_network():
"192.168.1.43", "192.168.1.43",
"192.168.1.60", "192.168.1.60",
] ]
miner_net_1 = "192.168.1.0"
miner_net_1_mask = 29
####################### net_1 = list(MinerNetworkRange(net_range_str).hosts())
# Network Range Tests # net_2 = list(MinerNetworkRange(net_range_list).hosts())
#######################
net_range_1 = list(MinerNetworkRange(net_range_str).hosts()) correct_net = [
net_range_2 = list(MinerNetworkRange(net_range_list).hosts())
correct_net_range = [
ipaddress.IPv4Address("192.168.1.29"), ipaddress.IPv4Address("192.168.1.29"),
ipaddress.IPv4Address("192.168.1.40"), ipaddress.IPv4Address("192.168.1.40"),
ipaddress.IPv4Address("192.168.1.41"), ipaddress.IPv4Address("192.168.1.41"),
@@ -34,20 +29,16 @@ def test_network():
ipaddress.IPv4Address("192.168.1.60"), ipaddress.IPv4Address("192.168.1.60"),
] ]
assert net_range_1 == correct_net_range self.assertTrue(net_1 == correct_net)
assert net_range_2 == correct_net_range self.assertTrue(net_2 == correct_net)
print("Network Range test succeeded.") def test_net(self):
net_1_str = "192.168.1.0"
net_1_mask = 29
####################### net_1 = list(MinerNetwork(net_1_str, mask=net_1_mask).get_network().hosts())
# Miner Network Tests #
#######################
miner_net = list( net_2 = list(
MinerNetwork(miner_net_1, mask=miner_net_1_mask).get_network().hosts()
)
miner_net_str = list(
MinerNetwork("192.168.1.1-192.168.1.5, 192.168.1.6").get_network().hosts() MinerNetwork("192.168.1.1-192.168.1.5, 192.168.1.6").get_network().hosts()
) )
@@ -60,11 +51,9 @@ def test_network():
ipaddress.IPv4Address("192.168.1.6"), ipaddress.IPv4Address("192.168.1.6"),
] ]
assert miner_net == correct_net self.assertTrue(net_1 == correct_net)
assert miner_net_str == correct_net self.assertTrue(net_2 == correct_net)
print("Miner Network test succeeded.")
if __name__ == "__main__": if __name__ == "__main__":
test_network() unittest.main()