diff options
author | 2016-01-20 15:32:22 +0200 | |
---|---|---|
committer | 2016-01-20 15:32:22 +0200 | |
commit | 1d8c0a97f418555058efd9b149b1fec0cb808eb7 (patch) | |
tree | 0b0469282684d5d97f8aca477f69c3d60d29ef4b /scripts/automation/regression/unit_tests/functional_tests | |
parent | fbbbb8fe6025da27ee3d703c3803e07cb7ecfd51 (diff) | |
parent | 0798c924dfcdfcf0c02ae74136013daa5d7d16f4 (diff) |
merge
Diffstat (limited to 'scripts/automation/regression/unit_tests/functional_tests')
-rwxr-xr-x | scripts/automation/regression/unit_tests/functional_tests/pkt_builder_test.py | 8 | ||||
-rwxr-xr-x | scripts/automation/regression/unit_tests/functional_tests/test.pcap | bin | 346 -> 0 bytes | |||
-rwxr-xr-x | scripts/automation/regression/unit_tests/functional_tests/test2.pcap | bin | 93 -> 0 bytes | |||
-rwxr-xr-x | scripts/automation/regression/unit_tests/functional_tests/test_cmp.pcap | bin | 346 -> 0 bytes |
4 files changed, 4 insertions, 4 deletions
diff --git a/scripts/automation/regression/unit_tests/functional_tests/pkt_builder_test.py b/scripts/automation/regression/unit_tests/functional_tests/pkt_builder_test.py index fd157c8a..96393d1e 100755 --- a/scripts/automation/regression/unit_tests/functional_tests/pkt_builder_test.py +++ b/scripts/automation/regression/unit_tests/functional_tests/pkt_builder_test.py @@ -188,7 +188,7 @@ class CTRexPktBuilder_Test(pkt_bld_general_test.CGeneralPktBld_Test): def test_get_layer(self): assert_equal(self.pkt_bld.get_layer('no_such_layer'), None) assert(not(self.pkt_bld.get_layer('l2') is self.pkt_bld._packet)) - assert(type(self.pkt_bld.get_layer('l2')).__name__, "ethernet") + assert_equal(type(self.pkt_bld.get_layer('l2')).__name__, "Ethernet") def test_dump_to_pcap(self): # set Ethernet layer attributes @@ -212,11 +212,11 @@ class CTRexPktBuilder_Test(pkt_bld_general_test.CGeneralPktBld_Test): # finally, set IP header len with relation to payload data self.pkt_bld.set_layer_attr("l3_ip", "len", len(self.pkt_bld.get_layer('l3_ip'))) - filepath = "unit_tests/functional_tests/test.pcap" + filepath = "reports/test.pcap" self.pkt_bld.dump_pkt_to_pcap(filepath) assert os.path.isfile(filepath) - # remove pcap after creation - masked for now - # os.remove(filepath) + # remove pcap after ensuring it exists + os.remove(filepath) filepath = "/not/a/valid/path/test.pcap" assert_raises(IOError, self.pkt_bld.dump_pkt_to_pcap, filepath) # check that dump is not available for empty packet diff --git a/scripts/automation/regression/unit_tests/functional_tests/test.pcap b/scripts/automation/regression/unit_tests/functional_tests/test.pcap Binary files differdeleted file mode 100755 index 131b7883..00000000 --- a/scripts/automation/regression/unit_tests/functional_tests/test.pcap +++ /dev/null diff --git a/scripts/automation/regression/unit_tests/functional_tests/test2.pcap b/scripts/automation/regression/unit_tests/functional_tests/test2.pcap Binary files differdeleted file mode 100755 index 1d35d9c1..00000000 --- a/scripts/automation/regression/unit_tests/functional_tests/test2.pcap +++ /dev/null diff --git a/scripts/automation/regression/unit_tests/functional_tests/test_cmp.pcap b/scripts/automation/regression/unit_tests/functional_tests/test_cmp.pcap Binary files differdeleted file mode 100755 index 4c92859f..00000000 --- a/scripts/automation/regression/unit_tests/functional_tests/test_cmp.pcap +++ /dev/null |