hs-test: fix wait for app after ldp change

After gerrit 38370 (729b9c94), apps are registered via ldp using program
name. Update tests to support that.

Also add make file help for UNCONFIGURE.

Type: test

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: I4ad50abfd175664b47b358df1a72e0758f51190d

3 files changed, 4 insertions, 3 deletions

diff --git a/extras/hs-test/Makefile b/extras/hs-test/Makefile
index a392c14871a..268a518b7ca 100644
--- a/extras/hs-test/Makefile
+++ b/extras/hs-test/Makefile
@@ -32,6 +32,7 @@ help:
 	@echo " UBUNTU_VERSION           - ubuntu version for docker image"
 	@echo " PERSIST=[true|false]     - whether clean up topology and dockers after test"
 	@echo " VERBOSE=[true|false]     - verbose output"
+	@echo " UNCONFIGURE=[true|false] - unconfigure selected test"
 	@echo " TEST=[test-name]         - specific test to run"
 	@echo
 	@echo "List of all tests:"
diff --git a/extras/hs-test/http_test.go b/extras/hs-test/http_test.go
index c1b3b7f2a03..3f1d303d422 100644
--- a/extras/hs-test/http_test.go
+++ b/extras/hs-test/http_test.go
@@ -48,7 +48,7 @@ func (s *NoTopoSuite) TestNginxAsServer() {
 	s.assertNil(nginxCont.run())
 
 	vpp := s.getContainerByName("vpp").vppInstance
-	vpp.waitForApp("-app", 5)
+	vpp.waitForApp("nginx-", 5)
 
 	serverAddress := s.netInterfaces[tapInterfaceName].Peer().IP4AddressString()
 
@@ -85,7 +85,7 @@ func runNginxPerf(s *NoTopoSuite, mode, ab_or_wrk string) error {
 
 	nginxCont := s.getContainerByName("nginx")
 	s.assertNil(nginxCont.run())
-	vpp.waitForApp("-app", 5)
+	vpp.waitForApp("nginx-", 5)
 
 	cmd := exec.Command(exeName, args...)
 	s.log(cmd)
diff --git a/extras/hs-test/suite_nginx_test.go b/extras/hs-test/suite_nginx_test.go
index e66eca70d73..d8115821000 100644
--- a/extras/hs-test/suite_nginx_test.go
+++ b/extras/hs-test/suite_nginx_test.go
@@ -60,5 +60,5 @@ func (s *NginxSuite) SetupTest() {
 	)
 	nginxContainer.start()
 
-	proxyVpp.waitForApp("-app", 5)
+	proxyVpp.waitForApp("nginx-", 5)
 }