From: Dave Wallace <dwallacelf@gmail.com>
Date: Fri, 3 Apr 2020 23:48:48 +0000 (-0400)
Subject: vcl: fix vcl_test.py sonarcloud issue
X-Git-Tag: v20.09-rc0~280
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F56%2F26356%2F3;p=vpp.git

vcl: fix vcl_test.py sonarcloud issue

- Updated comment to indicate the original
  intermittent test failure still occurs when
  running make test with TEST_JOBS > 1.
- The original workaround has been retained
  until the root cause can be determined to
  avoid test failures in the LF CI infra
  with patches containing non-vcl code changes.

Type: test

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I2645acd4bf2b16fbb2b0e297c8c2919fc6199c13
---

diff --git a/src/vcl/test/test_vcl.py b/src/vcl/test/test_vcl.py
index d49bfbcaa35..ea57c90be2e 100644
--- a/src/vcl/test/test_vcl.py
+++ b/src/vcl/test/test_vcl.py
@@ -500,20 +500,15 @@ class LDPThruHostStackBidirNsock(VCLTestCase):
         super(LDPThruHostStackBidirNsock, self).setUp()
 
         self.thru_host_stack_setup()
-        if self.vppDebug:
-            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 = 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]
+        self.client_bi_dir_nsock_timeout = 20
+        self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
+                                              # OUCH! Host Stack Bug?
+                                              # Only fails when running
+                                              # 'make test TEST_JOBS=auto'
+                                              # or TEST_JOBS > 1
+                                              # "-I", "2",
+                                              self.loop0.local_ip4,
+                                              self.server_port]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()