hs-test: auto register test actions

[vpp.git] / extras / hs-test / vcl_test.go

diff --git a/extras/hs-test/vcl_test.go b/extras/hs-test/vcl_test.go
index 96ca7f6..f699a65 100755 (executable)
--- a/extras/hs-test/vcl_test.go
+++ b/extras/hs-test/vcl_test.go
@@ -32,14 +32,14 @@ func (s *Veths2Suite) testVclEcho(proto string) {
        echoSrv := "echo-srv"
        echoCln := "echo-cln"
 
-       err := dockerRun(srvInstance, "-v echo-srv-vol:/tmp/2veths")
+       err := dockerRun(srvInstance, "-v echo-srv-vol:/tmp/Configure2Veths")
        if err != nil {
                t.Errorf("%v", err)
                return
        }
        defer func() { exechelper.Run("docker stop " + srvInstance) }()
 
-       err = dockerRun(clnInstance, "-v echo-cln-vol:/tmp/2veths")
+       err = dockerRun(clnInstance, "-v echo-cln-vol:/tmp/Configure2Veths")
        if err != nil {
                t.Errorf("%v", err)
                return
@@ -60,26 +60,26 @@ func (s *Veths2Suite) testVclEcho(proto string) {
        }
        defer func() { exechelper.Run("docker stop " + echoCln) }()
 
-       _, err = hstExec("2veths srv", srvInstance)
+       _, err = hstExec("Configure2Veths srv", srvInstance)
        if err != nil {
                t.Errorf("%v", err)
                return
        }
 
-       _, err = hstExec("2veths cln", clnInstance)
+       _, err = hstExec("Configure2Veths cln", clnInstance)
        if err != nil {
                t.Errorf("%v", err)
                return
        }
 
        // run server app
-       _, err = hstExec("echo-server "+proto, echoSrv)
+       _, err = hstExec("RunEchoServer "+proto, echoSrv)
        if err != nil {
                t.Errorf("echo server: %v", err)
                return
        }
 
-       o, err := hstExec("echo-client "+proto, echoCln)
+       o, err := hstExec("RunEchoClient "+proto, echoCln)
        if err != nil {
                t.Errorf("echo client: %v", err)
        }
@@ -87,6 +87,7 @@ func (s *Veths2Suite) testVclEcho(proto string) {
 }
 
 func (s *Veths2Suite) TestVclRetryAttach() {
+       s.T().Skip()
        s.testRetryAttach("tcp")
 }
 
@@ -101,14 +102,14 @@ func (s *Veths2Suite) testRetryAttach(proto string) {
        echoSrv := "echo-srv"
        echoCln := "echo-cln"
 
-       err := dockerRun(srvInstance, "-v echo-srv-vol:/tmp/2veths")
+       err := dockerRun(srvInstance, "-v echo-srv-vol:/tmp/Configure2Veths")
        if err != nil {
                t.Errorf("%v", err)
                return
        }
        defer func() { exechelper.Run("docker stop " + srvInstance) }()
 
-       err = dockerRun(clnInstance, "-v echo-cln-vol:/tmp/2veths")
+       err = dockerRun(clnInstance, "-v echo-cln-vol:/tmp/Configure2Veths")
        if err != nil {
                t.Errorf("%v", err)
                return
@@ -129,19 +130,19 @@ func (s *Veths2Suite) testRetryAttach(proto string) {
        }
        defer func() { exechelper.Run("docker stop " + echoCln) }()
 
-       _, err = hstExec("2veths srv-with-preset-hw-addr", srvInstance)
+       _, err = hstExec("Configure2Veths srv-with-preset-hw-addr", srvInstance)
        if err != nil {
                t.Errorf("%v", err)
                return
        }
 
-       _, err = hstExec("2veths cln", clnInstance)
+       _, err = hstExec("Configure2Veths cln", clnInstance)
        if err != nil {
                t.Errorf("%v", err)
                return
        }
 
-       _, err = hstExec("vcl-test-server "+proto, echoSrv)
+       _, err = hstExec("RunVclEchoServer "+proto, echoSrv)
        if err != nil {
                t.Errorf("vcl test server: %v", err)
                return
@@ -149,7 +150,7 @@ func (s *Veths2Suite) testRetryAttach(proto string) {
 
        fmt.Println("This whole test case can take around 3 minutes to run. Please be patient.")
        fmt.Println("... Running first echo client test, before disconnect.")
-       _, err = hstExec("vcl-test-client "+proto, echoCln)
+       _, err = hstExec("RunVclEchoClient "+proto, echoCln)
        if err != nil {
                t.Errorf("vcl test client: %v", err)
                return
@@ -170,7 +171,7 @@ func (s *Veths2Suite) testRetryAttach(proto string) {
                t.Errorf("error while stopping hs-test: %v", err)
                return
        }
-       _, err = hstExec("2veths srv-with-preset-hw-addr", srvInstance)
+       _, err = hstExec("Configure2Veths srv-with-preset-hw-addr", srvInstance)
        if err != nil {
                t.Errorf("%v", err)
                return
@@ -180,7 +181,7 @@ func (s *Veths2Suite) testRetryAttach(proto string) {
        time.Sleep(30 * time.Second) // Wait a moment for the re-attachment to happen
 
        fmt.Println("... Running second echo client test, after disconnect and re-attachment.")
-       _, err = hstExec("vcl-test-client "+proto, echoCln)
+       _, err = hstExec("RunVclEchoClient "+proto, echoCln)
        if err != nil {
                t.Errorf("vcl test client: %v", err)
        }