X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=d65dc9f0c8eb4ee2f560408a9999e471e388ea03;hb=0ae445ea1152e04dc73d2daf63fe0ffe0c5fd4ad;hp=8a7faad6f0c6af7f5017322e6240ae21769fbf50;hpb=ab2f6dbf9f7b7164a9810f4c80c8abf8463e42ad;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index 8a7faad6f0c..d65dc9f0c8e 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -33,7 +33,7 @@ class VCLTestCase(VppTestCase): """ VCL Test Class """ def __init__(self, methodName): - var = "VPP_TEST_BUILD_DIR" + var = "VPP_BUILD_DIR" self.build_dir = os.getenv(var, None) if self.build_dir is None: raise Exception("Environment variable `%s' not set" % var) @@ -61,7 +61,7 @@ class VCLTestCase(VppTestCase): worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) worker_server.start() - self.sleep(0.2) + self.sleep(0.3) worker_client = VCLAppWorker(self.build_dir, client_app, client_args, self.logger, self.env) worker_client.start() @@ -171,7 +171,7 @@ class VCLTestCase(VppTestCase): worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) worker_server.start() - self.sleep(0.2) + self.sleep(0.3) self.env.update({'VCL_APP_NAMESPACE_ID': "2", 'VCL_APP_NAMESPACE_SECRET': "5678"}) @@ -212,11 +212,11 @@ class VCLTestCase(VppTestCase): self.assert_equal(worker_client.result, 0, "Binary test return code") -class VCLCutThruTestCase(VCLTestCase): - """ VCL Cut Thru Tests """ +class LDPCutThruTestCase(VCLTestCase): + """ LDP Cut Thru Tests """ def setUp(self): - super(VCLCutThruTestCase, self).setUp() + super(LDPCutThruTestCase, self).setUp() self.cut_thru_setup() self.client_echo_test_args = ["-E", self.echo_phrase, "-X", @@ -224,19 +224,21 @@ class VCLCutThruTestCase(VCLTestCase): self.client_iperf3_timeout = 20 self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.server_addr] self.server_iperf3_args = ["-V4d", "-s"] - self.client_uni_dir_nsock_timeout = 60 - self.client_uni_dir_nsock_test_args = ["-I", "5", "-U", "-X", + self.client_uni_dir_nsock_timeout = 20 + self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-I", "2", self.server_addr, self.server_port] - self.client_bi_dir_nsock_timeout = 120 - self.client_bi_dir_nsock_test_args = ["-I", "2", "-B", "-X", + self.client_bi_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-I", "2", self.server_addr, self.server_port] def tearDown(self): self.cut_thru_tear_down() - super(VCLCutThruTestCase, self).tearDown() + super(LDPCutThruTestCase, self).tearDown() def test_ldp_cut_thru_echo(self): """ run LDP cut thru echo test """ @@ -249,7 +251,7 @@ class VCLCutThruTestCase(VCLTestCase): try: subprocess.check_output(['iperf3', '-v']) - except: + except subprocess.CalledProcessError: self.logger.error("WARNING: 'iperf3' is not installed,") self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!") return @@ -258,7 +260,6 @@ class VCLCutThruTestCase(VCLTestCase): self.cut_thru_test("iperf3", self.server_iperf3_args, "iperf3", self.client_iperf3_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_cut_thru_uni_dir_nsock(self): """ run LDP cut thru uni-directional (multiple sockets) test """ @@ -267,7 +268,6 @@ class VCLCutThruTestCase(VCLTestCase): "sock_test_client", self.client_uni_dir_nsock_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_cut_thru_bi_dir_nsock(self): """ run LDP cut thru bi-directional (multiple sockets) test """ @@ -276,13 +276,39 @@ class VCLCutThruTestCase(VCLTestCase): "sock_test_client", self.client_bi_dir_nsock_test_args) + +class VCLCutThruTestCase(VCLTestCase): + """ VCL Cut Thru Tests """ + + def setUp(self): + super(VCLCutThruTestCase, self).setUp() + + self.cut_thru_setup() + self.client_echo_test_args = ["-E", self.echo_phrase, "-X", + self.server_addr, self.server_port] + + self.client_uni_dir_nsock_timeout = 20 + self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-I", "2", + self.server_addr, + self.server_port] + self.client_bi_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-I", "2", + self.server_addr, + self.server_port] + + def tearDown(self): + self.cut_thru_tear_down() + + super(VCLCutThruTestCase, self).tearDown() + def test_vcl_cut_thru_echo(self): """ run VCL cut thru echo test """ self.cut_thru_test("vcl_test_server", self.server_args, "vcl_test_client", self.client_echo_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_cut_thru_uni_dir_nsock(self): """ run VCL cut thru uni-directional (multiple sockets) test """ @@ -291,7 +317,6 @@ class VCLCutThruTestCase(VCLTestCase): "vcl_test_client", self.client_uni_dir_nsock_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_cut_thru_bi_dir_nsock(self): """ run VCL cut thru bi-directional (multiple sockets) test """ @@ -336,35 +361,36 @@ class VCLThruHostStackTestCase(VCLTestCase): # "vcl_test_client", # self.client_echo_test_args) - # TBD: Remove VCLThruHostStackExtended*TestCase classes and move + # TBD: Remove VCLThruHostStackGroup*TestCase classes and move # tests here when VPP thru host teardown/setup config bug # is fixed. -class VCLThruHostStackExtendedATestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ +class VCLThruHostStackNSessionBidirTestCase(VCLTestCase): + """ VCL Thru Host Stack NSession Bidir Tests """ def setUp(self): - super(VCLThruHostStackExtendedATestCase, self).setUp() + super(VCLThruHostStackNSessionBidirTestCase, self).setUp() self.thru_host_stack_setup() if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 - self.client_bi_dir_nsock_test_args = ["-B", "-X", + self.client_bi_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-I", "2", self.loop0.local_ip4, self.server_port] else: - self.client_bi_dir_nsock_timeout = 90 - self.client_bi_dir_nsock_test_args = ["-I", "2", "-B", "-X", + self.client_bi_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-I", "2", self.loop0.local_ip4, self.server_port] def tearDown(self): self.thru_host_stack_tear_down() - super(VCLThruHostStackExtendedATestCase, self).tearDown() + super(VCLThruHostStackNSessionBidirTestCase, self).tearDown() - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_thru_host_stack_bi_dir_nsock(self): """ run VCL thru host stack bi-directional (multiple sockets) test """ @@ -374,30 +400,33 @@ class VCLThruHostStackExtendedATestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class VCLThruHostStackExtendedBTestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ +class VCLThruHostStackGroupBTestCase(VCLTestCase): + """ VCL Thru Host Stack Group B Tests """ def setUp(self): - super(VCLThruHostStackExtendedBTestCase, self).setUp() + super(VCLThruHostStackGroupBTestCase, self).setUp() self.thru_host_stack_setup() if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 - self.client_bi_dir_nsock_test_args = ["-B", "-X", + self.client_bi_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + # OUCH! Host Stack Bug? + # "-I", "2", self.loop0.local_ip4, self.server_port] else: - self.client_bi_dir_nsock_timeout = 60 - self.client_bi_dir_nsock_test_args = ["-I", "2", "-B", "-X", + self.client_bi_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + # OUCH! Host Stack Bug? + # "-I", "2", self.loop0.local_ip4, self.server_port] def tearDown(self): self.thru_host_stack_tear_down() - super(VCLThruHostStackExtendedBTestCase, self).tearDown() + super(VCLThruHostStackGroupBTestCase, self).tearDown() - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_thru_host_stack_bi_dir_nsock(self): """ run LDP thru host stack bi-directional (multiple sockets) test """ @@ -407,31 +436,30 @@ class VCLThruHostStackExtendedBTestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class VCLThruHostStackExtendedCTestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ +class VCLThruHostStackGroupCTestCase(VCLTestCase): + """ VCL Thru Host Stack Group C Tests """ def setUp(self): - super(VCLThruHostStackExtendedCTestCase, self).setUp() + super(VCLThruHostStackGroupCTestCase, self).setUp() self.thru_host_stack_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" - self.client_uni_dir_nsock_test_args = ["-I", self.numSockets, - "-U", "-X", + self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-I", self.numSockets, self.loop0.local_ip4, self.server_port] def tearDown(self): self.thru_host_stack_tear_down() - super(VCLThruHostStackExtendedCTestCase, self).tearDown() + super(VCLThruHostStackGroupCTestCase, self).tearDown() - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_thru_host_stack_uni_dir_nsock(self): """ run LDP thru host stack uni-directional (multiple sockets) test """ @@ -441,31 +469,30 @@ class VCLThruHostStackExtendedCTestCase(VCLTestCase): self.client_uni_dir_nsock_test_args) -class VCLThruHostStackExtendedDTestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ +class VCLThruHostStackGroupDTestCase(VCLTestCase): + """ VCL Thru Host Stack Group D Tests """ def setUp(self): - super(VCLThruHostStackExtendedDTestCase, self).setUp() + super(VCLThruHostStackGroupDTestCase, self).setUp() self.thru_host_stack_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" - self.client_uni_dir_nsock_test_args = ["-I", self.numSockets, - "-U", "-X", + self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-I", self.numSockets, self.loop0.local_ip4, self.server_port] def tearDown(self): self.thru_host_stack_tear_down() - super(VCLThruHostStackExtendedDTestCase, self).tearDown() + super(VCLThruHostStackGroupDTestCase, self).tearDown() - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_thru_host_stack_uni_dir_nsock(self): """ run VCL thru host stack uni-directional (multiple sockets) test """ @@ -496,7 +523,7 @@ class VCLThruHostStackIperfTestCase(VCLTestCase): try: subprocess.check_output(['iperf3', '-v']) - except: + except subprocess.CalledProcessError: self.logger.error("WARNING: 'iperf3' is not installed,") self.logger.error( " 'test_ldp_thru_host_stack_iperf3' not run!") @@ -507,35 +534,37 @@ class VCLThruHostStackIperfTestCase(VCLTestCase): "iperf3", self.client_iperf3_args) -class VCLIpv6CutThruTestCase(VCLTestCase): - """ VCL IPv6 Cut Thru Tests """ +class LDPIpv6CutThruTestCase(VCLTestCase): + """ LDP IPv6 Cut Thru Tests """ def setUp(self): - super(VCLIpv6CutThruTestCase, self).setUp() + super(LDPIpv6CutThruTestCase, self).setUp() self.cut_thru_setup() self.client_iperf3_timeout = 20 - self.client_uni_dir_nsock_timeout = 60 - self.client_bi_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_timeout = 20 self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X", self.server_ipv6_addr, self.server_port] self.client_ipv6_iperf3_args = ["-V6d", "-t 5", "-c", self.server_ipv6_addr] self.server_ipv6_iperf3_args = ["-V6d", "-s"] - self.client_ipv6_uni_dir_nsock_test_args = ["-6", "-I", "5", - "-U", "-X", + self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-6", + "-I", "2", self.server_ipv6_addr, self.server_port] - self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-I", "2", - "-B", "-X", + self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-6", + "-I", "2", self.server_ipv6_addr, self.server_port] def tearDown(self): self.cut_thru_tear_down() - super(VCLIpv6CutThruTestCase, self).tearDown() + super(LDPIpv6CutThruTestCase, self).tearDown() def test_ldp_ipv6_cut_thru_echo(self): """ run LDP IPv6 cut thru echo test """ @@ -560,7 +589,6 @@ class VCLIpv6CutThruTestCase(VCLTestCase): self.cut_thru_test("iperf3", self.server_ipv6_iperf3_args, "iperf3", self.client_ipv6_iperf3_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_ipv6_cut_thru_uni_dir_nsock(self): """ run LDP IPv6 cut thru uni-directional (multiple sockets) test """ @@ -569,7 +597,6 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_uni_dir_nsock_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_ipv6_cut_thru_bi_dir_nsock(self): """ run LDP IPv6 cut thru bi-directional (multiple sockets) test """ @@ -578,6 +605,35 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_bi_dir_nsock_test_args) + +class VCLIpv6CutThruTestCase(VCLTestCase): + """ VCL IPv6 Cut Thru Tests """ + + def setUp(self): + super(VCLIpv6CutThruTestCase, self).setUp() + + self.cut_thru_setup() + self.client_uni_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_timeout = 20 + self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X", + self.server_ipv6_addr, + self.server_port] + self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-6", + "-I", "2", + self.server_ipv6_addr, + self.server_port] + self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-6", + "-I", "2", + self.server_ipv6_addr, + self.server_port] + + def tearDown(self): + self.cut_thru_tear_down() + + super(VCLIpv6CutThruTestCase, self).tearDown() + def test_vcl_ipv6_cut_thru_echo(self): """ run VCL IPv6 cut thru echo test """ @@ -586,7 +642,6 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "vcl_test_client", self.client_ipv6_echo_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_ipv6_cut_thru_uni_dir_nsock(self): """ run VCL IPv6 cut thru uni-directional (multiple sockets) test """ @@ -595,7 +650,6 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "vcl_test_client", self.client_ipv6_uni_dir_nsock_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_ipv6_cut_thru_bi_dir_nsock(self): """ run VCL IPv6 cut thru bi-directional (multiple sockets) test """ @@ -642,36 +696,38 @@ class VCLIpv6ThruHostStackTestCase(VCLTestCase): # "vcl_test_client", # self.client_ipv6_echo_test_args) - # TBD: Remove VCLIpv6ThruHostStackExtended*TestCase classes and move + # TBD: Remove VCLIpv6ThruHostStackGroup*TestCase classes and move # tests here when VPP thru host teardown/setup config bug # is fixed. -class VCLIpv6ThruHostStackExtendedATestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ +class VCLIpv6ThruHostStackGroupATestCase(VCLTestCase): + """ VCL IPv6 Thru Host Stack Group A Tests """ def setUp(self): - super(VCLIpv6ThruHostStackExtendedATestCase, self).setUp() + super(VCLIpv6ThruHostStackGroupATestCase, self).setUp() self.thru_host_stack_ipv6_setup() if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 - self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-B", "-X", + self.client_bi_dir_nsock_timeout = 20 + self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", + "-B", "-X", "-6", + "-I", "2", self.loop0.local_ip6, self.server_port] else: - self.client_bi_dir_nsock_timeout = 90 - self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-I", - "2", "-B", "-X", + self.client_bi_dir_nsock_timeout = 20 + self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", + "-B", "-X", "-6", + "-I", "2", self.loop0.local_ip6, self.server_port] def tearDown(self): self.thru_host_stack_ipv6_tear_down() - super(VCLIpv6ThruHostStackExtendedATestCase, self).tearDown() + super(VCLIpv6ThruHostStackGroupATestCase, self).tearDown() - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_thru_host_stack_bi_dir_nsock(self): """ run VCL thru host stack bi-directional (multiple sockets) test """ @@ -681,31 +737,35 @@ class VCLIpv6ThruHostStackExtendedATestCase(VCLTestCase): self.client_ipv6_bi_dir_nsock_test_args) -class VCLIpv6ThruHostStackExtendedBTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ +class VCLIpv6ThruHostStackGroupBTestCase(VCLTestCase): + """ VCL IPv6 Thru Host Stack Group B Tests """ def setUp(self): - super(VCLIpv6ThruHostStackExtendedBTestCase, self).setUp() + super(VCLIpv6ThruHostStackGroupBTestCase, self).setUp() self.thru_host_stack_ipv6_setup() if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 - self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-B", "-X", + self.client_bi_dir_nsock_timeout = 20 + self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", + "-B", "-X", "-6", + # OUCH! Host Stack Bug? + # "-I", "2", self.loop0.local_ip6, self.server_port] else: - self.client_bi_dir_nsock_timeout = 60 - self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-I", "2", - "-B", "-X", + self.client_bi_dir_nsock_timeout = 20 + self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", + "-B", "-X", "-6", + # OUCH! Host Stack Bug? + # "-I", "2", self.loop0.local_ip6, self.server_port] def tearDown(self): self.thru_host_stack_ipv6_tear_down() - super(VCLIpv6ThruHostStackExtendedBTestCase, self).tearDown() + super(VCLIpv6ThruHostStackGroupBTestCase, self).tearDown() - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_thru_host_stack_bi_dir_nsock(self): """ run LDP thru host stack bi-directional (multiple sockets) test """ @@ -716,32 +776,31 @@ class VCLIpv6ThruHostStackExtendedBTestCase(VCLTestCase): self.client_ipv6_bi_dir_nsock_test_args) -class VCLIpv6ThruHostStackExtendedCTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ +class VCLIpv6ThruHostStackGroupCTestCase(VCLTestCase): + """ VCL IPv6 Thru Host Stack Group C Tests """ def setUp(self): - super(VCLIpv6ThruHostStackExtendedCTestCase, self).setUp() + super(VCLIpv6ThruHostStackGroupCTestCase, self).setUp() self.thru_host_stack_ipv6_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" - self.client_ipv6_uni_dir_nsock_test_args = ["-6", + self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-6", "-I", self.numSockets, - "-U", "-X", self.loop0.local_ip6, self.server_port] def tearDown(self): self.thru_host_stack_ipv6_tear_down() - super(VCLIpv6ThruHostStackExtendedCTestCase, self).tearDown() + super(VCLIpv6ThruHostStackGroupCTestCase, self).tearDown() - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_thru_host_stack_uni_dir_nsock(self): """ run LDP thru host stack uni-directional (multiple sockets) test """ @@ -752,32 +811,31 @@ class VCLIpv6ThruHostStackExtendedCTestCase(VCLTestCase): self.client_ipv6_uni_dir_nsock_test_args) -class VCLIpv6ThruHostStackExtendedDTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ +class VCLIpv6ThruHostStackGroupDTestCase(VCLTestCase): + """ VCL IPv6 Thru Host Stack Group D Tests """ def setUp(self): - super(VCLIpv6ThruHostStackExtendedDTestCase, self).setUp() + super(VCLIpv6ThruHostStackGroupDTestCase, self).setUp() self.thru_host_stack_ipv6_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" - self.client_ipv6_uni_dir_nsock_test_args = ["-6", + self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-6", "-I", self.numSockets, - "-U", "-X", self.loop0.local_ip6, self.server_port] def tearDown(self): self.thru_host_stack_ipv6_tear_down() - super(VCLIpv6ThruHostStackExtendedDTestCase, self).tearDown() + super(VCLIpv6ThruHostStackGroupDTestCase, self).tearDown() - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_thru_host_stack_uni_dir_nsock(self): """ run VCL thru host stack uni-directional (multiple sockets) test """ @@ -804,13 +862,12 @@ class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase): super(VCLIpv6ThruHostStackIperfTestCase, self).tearDown() - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_thru_host_stack_iperf3(self): """ run LDP thru host stack iperf3 test """ try: subprocess.check_output(['iperf3', '-v']) - except: + except subprocess.CalledProcessError: self.logger.error("WARNING: 'iperf3' is not installed,") self.logger.error( " 'test_ldp_thru_host_stack_iperf3' not run!")