From 5650f2add4b03ef8d51d670af5db9fccade80f3f Mon Sep 17 00:00:00 2001
From: Yaroslav Brustinov <ybrustin@cisco.com>
Date: Fri, 4 Mar 2016 13:56:15 +0200
Subject: return 4 tests

---
 .../functional_tests/scapy_pkt_builder_test.py     | 23 +++++++++++-----------
 .../unit_tests/functional_tests/stl_basic_tests.py |  6 +++---
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'scripts/automation/regression/unit_tests/functional_tests')

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 79ef4364..7e2f6271 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
@@ -308,18 +308,17 @@ class CTRexPktBuilderSanitySCapy_Test(pkt_bld_general_test.CGeneralPktBld_Test):
 
     def test_simple_pkt_loader1(self):
 
-        pass;
-        #pkt_builder = CScapyTRexPktBuilder(pkt = "stl/golden/udp_590.cap");
-        #print ""
-        #pkt_builder.dump_as_hex()
-        #r = pkt_builder.pkt_raw
-        #assert_equal(ord(r[1]),0x50)
-        #assert_equal(ord(r[0]),0x00)
-        #assert_equal(ord(r[0x240]),0x16)
-        #assert_equal(ord(r[0x24d]),0x79)
-        #assert_equal(len(r),590)
-
-        #print len(r)
+        pkt_builder = CScapyTRexPktBuilder(pkt = "stl/golden/udp_590.cap", build_raw = False);
+        print ""
+        pkt_builder.dump_as_hex()
+        r = pkt_builder.pkt_raw
+        assert_equal(ord(r[1]),0x50)
+        assert_equal(ord(r[0]),0x00)
+        assert_equal(ord(r[0x240]),0x16)
+        assert_equal(ord(r[0x24d]),0x79)
+        assert_equal(len(r),590)
+
+        print len(r)
 
     def test_simple_pkt_loader2(self):
 
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 88a6983f..44735435 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
@@ -170,8 +170,8 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test):
             ["udp_inc_len_9k.py","-m 1 -l 100",True],
             ["udp_1pkt_range_clients.py","-m 1 -l 100",True],
             ["multi_burst_2st_1000pkt.py","-m 1 -l 100",True],
-            #["pcap.py", "-m 1", True],
-            #["pcap_with_vm.py", "-m 1", True],
+            ["pcap.py", "-m 1", True],
+            ["pcap_with_vm.py", "-m 1", True],
 
             # YAML test
             ["yaml/burst_1000_pkt.yaml","-m 1 -l 100",True],
@@ -202,7 +202,7 @@ class CStlBasic_Test(functional_general_test.CGeneralFunctional_Test):
             ["udp_1pkt_simple_test2.py","-m 1 -l 10 ",True], # test split of packet with ip option
             ["udp_1pkt_simple_test.py","-m 1 -l 10 ",True],
             ["udp_1pkt_mac_mask5.py","-m 1 -l 30 ",True],
-            #["udp_1pkt_range_clients_split_garp.py","-m 1 -l 50",True]
+            ["udp_1pkt_range_clients_split_garp.py","-m 1 -l 50",True]
 
 
           ];
-- 
cgit 1.2.3-korg