diff options
| author |   imarom <imarom@cisco.com> | 2016-02-09 11:11:08 -0500 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2016-02-09 11:11:08 -0500 |
| commit | c07bd86f8c0a150f743c985dbef5e2bce857e0d9 (patch) | |
| tree | 038d10e67fc24d61217522dd914bfc2ee531f5e1 /scripts/automation/regression/unit_tests/functional_tests | |
| parent | 0aa48dc740012b94cdd0cea3e49c1cb0258d9ce9 (diff) | |
minor fixes
Diffstat (limited to 'scripts/automation/regression/unit_tests/functional_tests')
3 files changed, 17 insertions, 9 deletions
diff --git a/scripts/automation/regression/unit_tests/functional_tests/pkt_bld_general_test.py b/scripts/automation/regression/unit_tests/functional_tests/pkt_bld_general_test.py index b630147b..5f89eaff 100755 --- a/scripts/automation/regression/unit_tests/functional_tests/pkt_bld_general_test.py +++ b/scripts/automation/regression/unit_tests/functional_tests/pkt_bld_general_test.py @@ -6,7 +6,6 @@ from nose.tools import assert_raises from nose.tools import raises import sys import outer_packages -from client_utils.packet_builder import * class CGeneralPktBld_Test(object): diff --git a/scripts/automation/regression/unit_tests/functional_tests/scapy_pkt_builder_test.py b/scripts/automation/regression/unit_tests/functional_tests/scapy_pkt_builder_test.py index e8777fd1..dcebecdb 100644 --- a/scripts/automation/regression/unit_tests/functional_tests/scapy_pkt_builder_test.py +++ b/scripts/automation/regression/unit_tests/functional_tests/scapy_pkt_builder_test.py @@ -1,7 +1,16 @@ #!/router/bin/python import pkt_bld_general_test -from client_utils.scapy_packet_builder import * + +#HACK FIX ME START +import sys +import os + +CURRENT_PATH = os.path.dirname(os.path.realpath(__file__)) +sys.path.append(os.path.join(CURRENT_PATH, '../../../trex_control_plane/stl/')) +#HACK FIX ME END +from trex_stl_lib.trex_stl_packet_builder_scapy import * + from scapy.all import * from nose.tools import assert_equal from nose.tools import assert_not_equal @@ -258,7 +267,7 @@ class CTRexPktBuilderSanitySCapy_Test(pkt_bld_general_test.CGeneralPktBld_Test): def test_simple_pkt_loader1(self): - pkt_builder = CScapyTRexPktBuilder(pkt = "stl/golden/basic_imix_golden.cap"); + pkt_builder = CScapyTRexPktBuilder(pkt = "stl/golden/udp_590.cap"); print "" pkt_builder.dump_as_hex() r = pkt_builder.pkt_raw diff --git a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py index 51dccd98..f23a4469 100644 --- a/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py +++ b/scripts/automation/regression/unit_tests/functional_tests/stl_basic_tests.py @@ -22,14 +22,15 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test): self.verify_exists(os.path.join(self.scripts_path, "bp-sim-64-debug")) - self.stl_sim = os.path.join(self.scripts_path, "automation/trex_control_plane/client/trex_stateless_sim.py") + self.stl_sim = os.path.join(self.scripts_path, "stl-sim") + self.verify_exists(self.stl_sim) - self.profiles_path = os.path.join(self.scripts_path, "stl/") + self.profiles_path = os.path.join(self.scripts_path, "yaml/") self.profiles = {} self.profiles['imix_3pkt'] = os.path.join(self.profiles_path, "imix_3pkt.yaml") - self.profiles['imix_3pkt_vm'] = os.path.join(self.profiles_path, "imix_3pkt.yaml") + self.profiles['imix_3pkt_vm'] = os.path.join(self.profiles_path, "imix_3pkt_vm.yaml") self.profiles['random_size'] = os.path.join(self.profiles_path, "udp_rand_size.yaml") self.profiles['random_size_9k'] = os.path.join(self.profiles_path, "udp_rand_size_9k.yaml") self.profiles['imix_tuple_gen'] = os.path.join(self.profiles_path, "imix_1pkt_tuple_gen.yaml") @@ -88,9 +89,8 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test): else: user_cmd = "-f {0} {1}".format(yaml, options) - cmd = "{0} {1} {2}".format(sys.executable, - self.stl_sim, - user_cmd) + cmd = "{0} {1}".format(self.stl_sim, + user_cmd) if silent: devnull = open('/dev/null', 'w') |