X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Ftarget_test.go;h=4e863fc927699e249130674dfe98825d1b8a639b;hb=a740425411f120ff7263f16f268e7efd7c19b311;hp=17ac6b8d27c87b5b8d46748b42b2512e2983102c;hpb=b1d091a8c6b2269601a1683e963d0e382cd0f7f6;p=src%2Fxds%2Fxds-server.git diff --git a/test/target_test.go b/test/target_test.go index 17ac6b8..4e863fc 100644 --- a/test/target_test.go +++ b/test/target_test.go @@ -17,25 +17,128 @@ package xdsservertest import ( + "bytes" + "fmt" + "log" "os" + "os/exec" "path" + "regexp" "strconv" "strings" "testing" "time" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) -/*flush channel with timeout*/ -func flushChannelTerm(channel chan xsapiv1.TerminalOutMsg, ms time.Duration) { - timeoutB := false - for !timeoutB { +func launchSSHd(sshDir string, proc **os.Process, sshdCmd string) (*os.File, string) { + port := "22222" + argsProcessSSHd := []string{ + sshdCmd, + "-f", + sshDir + "/sshd_config", + "-D", + "-h", + sshDir + "/ssh_host_rsa_key", + "-o", + "AuthorizedKeysFile=" + sshDir + "/authorized_keys", + "-p", + port, + } + logFile := logDir + logFileSSHd + file, err := os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY, 0644) + if err != nil { + log.Fatal(err) + } + defer file.Close() + tmpProc, err := os.StartProcess(argsProcessSSHd[0], argsProcessSSHd, &os.ProcAttr{ + Files: []*os.File{os.Stdin, file, file}, + }) + if err != nil { + log.Fatal(err) + } + *proc = tmpProc + return file, port +} + +func InitSSH(t *testing.T, procSSHd **os.Process) (string, string) { + Debug(t, "Initialise ssh with local user") + sshDir := path.Join(os.Getenv(envRootCfgDir), "ssh") + cmd := exec.Command("cp", "-r", sshFixturesDir, sshDir) + var out bytes.Buffer + cmd.Stdout = &out + require.Nil(t, cmd.Run()) + + cmd = exec.Command("ls", sshDir) + cmd.Stdout = &out + require.Nil(t, cmd.Run()) + + files := strings.Split(fmt.Sprint(cmd.Stdout), "\n") + + for _, f := range files { + if f != "" { + file := sshDir + "/" + f + cmd = exec.Command("chmod", "600", file) + cmd.Stdout = &out + require.Nil(t, cmd.Run()) + } + } + + var outSSHd bytes.Buffer + var sshdCmd string + cmd = exec.Command("which", "sshd") + cmd.Stdout = &outSSHd + if cmd.Run() != nil { + if common.Exists("/usr/sbin/sshd") { + sshdCmd = "/usr/sbin/sshd" + } else if common.Exists("/usr/bin/sshd") { + sshdCmd = "/usr/sbin/sshd" + } else { + require.FailNow(t, "Cannot find sshd command, please install it or set in your PATH") + } + } else { + sshdCmd = strings.TrimSpace(fmt.Sprint(cmd.Stdout)) + } + + var port string + _, port = launchSSHd(sshDir, procSSHd, sshdCmd) + go func(p *os.Process) { + Debug(t, "sshd is launching") + if status, err := p.Wait(); err != nil { + log.Fatalf("status=%v\n err=%v\n", status, err) + } + }(*procSSHd) + return sshDir, port +} + +/*wait for terminal prompt*/ +func waitForPrompt(t *testing.T, channel chan xsapiv1.TerminalOutMsg, prompt string) string { + step := 1 * time.Millisecond + timeout := 10 * time.Second + current := 0 * time.Second + out := "" + re := regexp.MustCompile("^" + prompt) + + for { select { - case <-channel: - case <-time.After(ms * time.Millisecond): - timeoutB = true + case outMsg := <-channel: + out += string(outMsg.Stdout) + if string(outMsg.Stderr) != "" { + out += string(outMsg.Stderr) + } + for _, line := range strings.Split(out, "\n") { + if re.MatchString(line) { + return line + } + } + case <-time.After(step): + current = current + step + if current >= timeout { + require.FailNow(t, "Never received prompt message from terminal (output:"+out+")") + } } } } @@ -47,7 +150,7 @@ func ConnectTargetEvents(t *testing.T, channel chan xsapiv1.TargetConfig) { }) args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetAdd} - assert.Nil(t, HTTPCli.Post("/events/register", args, nil)) + require.Nil(t, HTTPCli.Post("/events/register", args, nil)) sCli.Conn.On(xsapiv1.EVTTargetRemove, func(e xsapiv1.EventMsg) { target, _ := e.DecodeTargetEvent() @@ -55,14 +158,14 @@ func ConnectTargetEvents(t *testing.T, channel chan xsapiv1.TargetConfig) { }) args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetRemove} - assert.Nil(t, HTTPCli.Post("/events/register", args, nil)) + require.Nil(t, HTTPCli.Post("/events/register", args, nil)) } func DisconnectTargetEvents(t *testing.T) { args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetAdd} - assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) + require.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetRemove} - assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) + require.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) } func ConnectTermEvents(t *testing.T, channel chan xsapiv1.TerminalConfig) { @@ -72,7 +175,7 @@ func ConnectTermEvents(t *testing.T, channel chan xsapiv1.TerminalConfig) { }) args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalAdd} - assert.Nil(t, HTTPCli.Post("/events/register", args, nil)) + require.Nil(t, HTTPCli.Post("/events/register", args, nil)) sCli.Conn.On(xsapiv1.EVTTargetTerminalStateChange, func(e xsapiv1.EventMsg) { termEvt, _ := e.DecodeTerminalEvent() @@ -80,7 +183,7 @@ func ConnectTermEvents(t *testing.T, channel chan xsapiv1.TerminalConfig) { }) args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalStateChange} - assert.Nil(t, HTTPCli.Post("/events/register", args, nil)) + require.Nil(t, HTTPCli.Post("/events/register", args, nil)) sCli.Conn.On(xsapiv1.EVTTargetTerminalRemove, func(e xsapiv1.EventMsg) { termEvt, _ := e.DecodeTerminalEvent() @@ -88,16 +191,16 @@ func ConnectTermEvents(t *testing.T, channel chan xsapiv1.TerminalConfig) { }) args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalRemove} - assert.Nil(t, HTTPCli.Post("/events/register", args, nil)) + require.Nil(t, HTTPCli.Post("/events/register", args, nil)) } func DisconnectTermEvents(t *testing.T) { args := xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalAdd} - assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) + require.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalStateChange} - assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) + require.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) args = xsapiv1.EventRegisterArgs{Name: xsapiv1.EVTTargetTerminalRemove} - assert.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) + require.Nil(t, HTTPCli.Post("/events/unregister", args, nil)) } func AddTargets(t *testing.T, nbTargets int, chTarget chan xsapiv1.TargetConfig) []string { @@ -110,45 +213,54 @@ func AddTargets(t *testing.T, nbTargets int, chTarget chan xsapiv1.TargetConfig) IP: "127.0.0.1", } /*add target*/ - assert.Nil(t, HTTPCli.Post("/targets", target, &target)) + require.Nil(t, HTTPCli.Post("/targets", target, &target)) Debugf(t, "add target %v", target.Name) targetEvt := <-chTarget //waiting for event targetAdd - assert.Equal(t, target.ID, targetEvt.ID) + require.Equal(t, target.ID, targetEvt.ID) listID[i] = target.ID } for i := 0; i < nbTargets; i++ { var target xsapiv1.TargetConfig - assert.Nil(t, HTTPCli.Get("/targets/"+listID[i], &target)) - assert.Equal(t, target.Status, "Enable") + require.Nil(t, HTTPCli.Get("/targets/"+listID[i], &target)) + require.Equal(t, target.Status, "Enable") } return listID } -func AddTerms(t *testing.T, nbTerms int, listID []string, chTermEvt chan xsapiv1.TerminalConfig) { +func AddTerms(t *testing.T, nbTerms int, listID []string, chTermEvt chan xsapiv1.TerminalConfig, sshDir string, port string) { for j := 0; j < len(listID); j++ { listTermsID := make([]string, nbTerms) for i := 0; i < nbTerms; i++ { term := xsapiv1.TerminalConfig{ Name: "terminal" + strconv.Itoa(i), Type: xsapiv1.TypeTermSSH, + Options: []string{ + "-p", + port, + "-i", + sshDir + "/ssh", + "-o", + "StrictHostKeyChecking=no", + }, } /*add terminal on target*/ - assert.Nil(t, HTTPCli.Post("/targets/"+listID[j]+"/terminals", term, &term)) + require.Nil(t, HTTPCli.Post("/targets/"+listID[j]+"/terminals", term, &term)) Debugf(t, "add terminal %v", term.Name) termEvt := <-chTermEvt //waiting for event terminalAdd*/ - assert.Equal(t, term.ID, termEvt.ID) + require.Equal(t, term.ID, termEvt.ID) listTermsID[i] = term.ID } - assert.Equal(t, len(listTermsID), nbTerms) + require.Equal(t, len(listTermsID), nbTerms) for i := 0; i < nbTerms; i++ { var term xsapiv1.TerminalConfig - assert.Nil(t, HTTPCli.Get("/targets/"+listID[j]+"/terminals/"+listTermsID[i], &term)) - assert.Equal(t, term.Status, "Close") + require.Nil(t, HTTPCli.Get("/targets/"+listID[j]+"/terminals/"+listTermsID[i], &term)) + require.Equal(t, term.Status, "Close") } } } -func PostTerms(t *testing.T, post string, chTermEvt chan xsapiv1.TerminalConfig) { +func PostTerms(t *testing.T, post string, chTermEvt chan xsapiv1.TerminalConfig, chTerm chan xsapiv1.TerminalOutMsg, + prompt string) { var status string switch post { case "open": @@ -157,27 +269,32 @@ func PostTerms(t *testing.T, post string, chTermEvt chan xsapiv1.TerminalConfig) status = "Closing" } var targets []xsapiv1.TargetConfig - assert.Nil(t, HTTPCli.Get("/targets", &targets)) + require.Nil(t, HTTPCli.Get("/targets", &targets)) for i := 0; i < len(targets); i++ { var terms []xsapiv1.TerminalConfig - assert.Nil(t, HTTPCli.Get("/targets/"+targets[i].ID+"/terminals", &terms)) + require.Nil(t, HTTPCli.Get("/targets/"+targets[i].ID+"/terminals", &terms)) listTermsID := make([]string, len(terms)) for j := 0; j < len(terms); j++ { var term xsapiv1.TerminalConfig /*post action on term*/ - assert.Nil(t, HTTPCli.Post("/targets/"+targets[i].ID+"/terminals/"+terms[j].ID+"/"+post, terms[j], &term)) + require.Nil(t, HTTPCli.Post("/targets/"+targets[i].ID+"/terminals/"+terms[j].ID+"/"+post, terms[j], &term)) Debugf(t, "%v terminal %v", post, term.Name) termEvt := <-chTermEvt //waiting for event terminalStateChange - assert.Equal(t, term.ID, termEvt.ID) - assert.Equal(t, term.Status, status) - assert.Equal(t, termEvt.Status, status) + if post == "open" { + data := []byte("PS1=" + prompt + " bash -norc\n") + require.Nil(t, sCli.Conn.Emit(xsapiv1.TerminalInEvent, data)) + waitForPrompt(t, chTerm, prompt) + } + require.Equal(t, term.ID, termEvt.ID) + require.Equal(t, term.Status, status) + require.Equal(t, termEvt.Status, status) listTermsID[i] = term.ID } time.Sleep(10 * time.Millisecond) for j := 0; j < len(listTermsID); j++ { var term xsapiv1.TerminalConfig - assert.Nil(t, HTTPCli.Get("/targets/"+targets[i].ID+"/terminals/"+listTermsID[i], &term)) - assert.True(t, strings.EqualFold(term.Status, post)) + require.Nil(t, HTTPCli.Get("/targets/"+targets[i].ID+"/terminals/"+listTermsID[i], &term)) + require.True(t, strings.EqualFold(term.Status, post)) Debugf(t, "check that term status %v is %v", term.Name, post) } } @@ -185,28 +302,33 @@ func PostTerms(t *testing.T, post string, chTermEvt chan xsapiv1.TerminalConfig) func RemoveTermsTargets(t *testing.T, chTarget chan xsapiv1.TargetConfig, chTermEvt chan xsapiv1.TerminalConfig) { var targets []xsapiv1.TargetConfig - assert.Nil(t, HTTPCli.Get("/targets", &targets)) + require.Nil(t, HTTPCli.Get("/targets", &targets)) for i := 0; i < len(targets); i++ { var terms []xsapiv1.TerminalConfig - assert.Nil(t, HTTPCli.Get("/targets/"+targets[i].ID+"/terminals", &terms)) + require.Nil(t, HTTPCli.Get("/targets/"+targets[i].ID+"/terminals", &terms)) for j := 0; j < len(terms); j++ { var term xsapiv1.TerminalConfig - assert.Nil(t, HTTPCli.Delete("/targets/"+targets[i].ID+"/terminals/"+terms[j].ID, &term)) + require.Nil(t, HTTPCli.Delete("/targets/"+targets[i].ID+"/terminals/"+terms[j].ID, &term)) termEvt := <-chTermEvt - assert.Equal(t, term.ID, termEvt.ID) - assert.NotNil(t, HTTPCli.Delete("/targets/"+targets[i].ID+"/terminals/"+terms[j].ID, &term)) + require.Equal(t, term.ID, termEvt.ID) + require.NotNil(t, HTTPCli.Delete("/targets/"+targets[i].ID+"/terminals/"+terms[j].ID, &term)) Debugf(t, "remove terminal %v", term.Name) } var tgtRes xsapiv1.TargetConfig - assert.Nil(t, HTTPCli.Delete("/targets/"+targets[i].ID, &tgtRes)) + require.Nil(t, HTTPCli.Delete("/targets/"+targets[i].ID, &tgtRes)) targetEvt := <-chTarget //waiting for remove terminal event - assert.Equal(t, tgtRes.ID, targetEvt.ID) - assert.Equal(t, targets[i].ID, tgtRes.ID) + require.Equal(t, tgtRes.ID, targetEvt.ID) + require.Equal(t, targets[i].ID, tgtRes.ID) } } func TestTarget(t *testing.T) { - nbTargets := 3 - nbTermsByTarget := 3 + prompt := "--PROMPT--" + var procSSHd *os.Process + sshDir, port := InitSSH(t, &procSSHd) + defer procSSHd.Kill() + + nbTargets := 2 + nbTermsByTarget := 2 /*channel for target events*/ chTarget := make(chan xsapiv1.TargetConfig) defer close(chTarget) @@ -219,11 +341,11 @@ func TestTarget(t *testing.T) { /*check that targetArray is empty at startup*/ var targetArray []xsapiv1.TargetConfig - assert.Nil(t, HTTPCli.Get("/targets", &targetArray)) - assert.Equal(t, len(targetArray), 0) + require.Nil(t, HTTPCli.Get("/targets", &targetArray)) + require.Equal(t, len(targetArray), 0) listID := AddTargets(t, nbTargets, chTarget) - AddTerms(t, nbTermsByTarget, listID, chTermEvt) + AddTerms(t, nbTermsByTarget, listID, chTermEvt, sshDir, port) /*channel for TerminalOutMsg*/ chTerm := make(chan xsapiv1.TerminalOutMsg) @@ -234,35 +356,8 @@ func TestTarget(t *testing.T) { chTerm <- ev }) - /*just for the first term*/ - var terms []xsapiv1.TerminalConfig - var term xsapiv1.TerminalConfig - assert.Nil(t, HTTPCli.Get("/targets/"+listID[0]+"/terminals", &terms)) - assert.Nil(t, HTTPCli.Post("/targets/"+listID[0]+"/terminals/"+terms[0].ID+"/open", terms[0], &term)) - <-chTermEvt //waiting for event terminalStateChange - termOut := <-chTerm //waiting for terminalOutMsg - flushChannelTerm(chTerm, 50) //flushing all terminalOutMsg - stdoutMsg := string(termOut.Stdout) - if strings.Contains(stdoutMsg, "Connection refused") { - t.Fatalf("%vYou may have to launch ssh server", stdoutMsg) - } else if strings.Contains(stdoutMsg, "password") { - t.Fatalf("%vcopy your pub key in authorized_keys\ncat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys", stdoutMsg) - } - assert.True(t, strings.Contains(stdoutMsg, "Last login")) //first terminal msg should be Last Login - assert.Nil(t, HTTPCli.Post("/targets/"+listID[0]+"/terminals/"+terms[0].ID+"/close", terms[0], &term)) - <-chTermEvt //waiting for event terminalStateChange - /*open terminals*/ - PostTerms(t, "open", chTermEvt) - termOut = <-chTerm //waiting for terminalOutMsg - flushChannelTerm(chTerm, 50) //flushing all terminalOutMsg - stdoutMsg = string(termOut.Stdout) - if strings.Contains(stdoutMsg, "Connection refused") { - t.Fatalf("%vYou may have to launch ssh server", stdoutMsg) - } else if strings.Contains(stdoutMsg, "password") { - t.Fatalf("%vcopy your pub key in authorized_keys\ncat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys", stdoutMsg) - } - assert.True(t, strings.Contains(stdoutMsg, "Last login")) //first terminal msg should be Last Login + PostTerms(t, "open", chTermEvt, chTerm, prompt) /*create toto file through terminals*/ rootCfgDir := os.Getenv(envRootCfgDir) @@ -274,27 +369,27 @@ func TestTarget(t *testing.T) { /*send cmd though term*/ data := []byte("echo helloWorld" + strconv.Itoa(i) + " >> " + totoFileCurrent + "\n") Debugf(t, "send following command through terminal: %v", string(data)) - assert.Nil(t, sCli.Conn.Emit(xsapiv1.TerminalInEvent, data)) - flushChannelTerm(chTerm, 50) //waiting for terminal msg + require.Nil(t, sCli.Conn.Emit(xsapiv1.TerminalInEvent, data)) + waitForPrompt(t, chTerm, prompt) //waiting for terminal prompt /*check that toto file is created*/ _, err := os.Stat(totoFileCurrent) - assert.Nil(t, err) + require.Nil(t, err) /*send cmd though term*/ data = []byte("cat " + totoFileCurrent + "\n") Debugf(t, "send following command through terminal: %v", string(data)) - assert.Nil(t, sCli.Conn.Emit(xsapiv1.TerminalInEvent, data)) + require.Nil(t, sCli.Conn.Emit(xsapiv1.TerminalInEvent, data)) - <-chTerm //cmd sent - termOut = <-chTerm //result of cat cmd - flushChannelTerm(chTerm, 50) //flushing what remains + <-chTerm //cmd sent + termOut := <-chTerm //result of cat cmd + waitForPrompt(t, chTerm, prompt) //wait for terminal prompt /*check that terminal msg is what was written before*/ - assert.Equal(t, string(termOut.Stdout), "helloWorld"+strconv.Itoa(i)+"\r\n") + require.Equal(t, string(termOut.Stdout), "helloWorld"+strconv.Itoa(i)+"\r\n") Debugf(t, "check terminal output msg: %v", string(termOut.Stdout)) } - PostTerms(t, "close", chTermEvt) + PostTerms(t, "close", chTermEvt, nil, prompt) /*remove targets and terms*/ RemoveTermsTargets(t, chTarget, chTermEvt) @@ -306,47 +401,47 @@ func TestTargetErrors(t *testing.T) { /*cannot create empty target*/ target := xsapiv1.TargetConfig{} var targetRes xsapiv1.TargetConfig - assert.NotNil(t, HTTPCli.Post("/targets", target, &targetRes)) + require.NotNil(t, HTTPCli.Post("/targets", target, &targetRes)) Debugf(t, "error while creating empty target") /*check cannot create target with no IP*/ target.Type = xsapiv1.TypeTgtStandard - assert.NotNil(t, HTTPCli.Post("/targets", target, &targetRes)) + require.NotNil(t, HTTPCli.Post("/targets", target, &targetRes)) Debugf(t, "error while creating target without IP") target.IP = "127.0.0.1" - assert.Nil(t, HTTPCli.Post("/targets", target, &targetRes)) + require.Nil(t, HTTPCli.Post("/targets", target, &targetRes)) Debugf(t, "create target %v", targetRes.Name) /*cannot create empty terminal*/ term := xsapiv1.TerminalConfig{} var termRes xsapiv1.TerminalConfig - assert.NotNil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) + require.NotNil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) Debugf(t, "error while creating empty terminal") term.Type = xsapiv1.TypeTermSSH - assert.NotNil(t, HTTPCli.Post("/targets/"+"1010"+"/terminals", term, &termRes)) + require.NotNil(t, HTTPCli.Post("/targets/"+"1010"+"/terminals", term, &termRes)) Debugf(t, "error while creating terminal on an non existing target") - assert.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) - assert.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) - assert.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) - assert.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) + require.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) + require.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) + require.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) + require.Nil(t, HTTPCli.Post("/targets/"+targetRes.ID+"/terminals", term, &termRes)) Debugf(t, "create several terminals") /*remove targets and terms*/ var targetArray []xsapiv1.TargetConfig - assert.Nil(t, HTTPCli.Get("/targets", &targetArray)) + require.Nil(t, HTTPCli.Get("/targets", &targetArray)) for i := 0; i < len(targetArray); i++ { var termArray []xsapiv1.TerminalConfig - assert.Nil(t, HTTPCli.Get("/targets/"+targetArray[i].ID+"/terminals", &termArray)) + require.Nil(t, HTTPCli.Get("/targets/"+targetArray[i].ID+"/terminals", &termArray)) for j := 0; j < len(termArray); j++ { - assert.Nil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID+"/terminals/"+termArray[j].ID, &termRes)) + require.Nil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID+"/terminals/"+termArray[j].ID, &termRes)) Debugf(t, "delete terminal %v", termRes.Name) - assert.NotNil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID+"/terminals/"+termArray[j].ID, &termRes)) + require.NotNil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID+"/terminals/"+termArray[j].ID, &termRes)) Debugf(t, "error while deleting an already deleted terminal %v", termRes.Name) } var tgtRes xsapiv1.TargetConfig - assert.Nil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID, &tgtRes)) + require.Nil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID, &tgtRes)) Debugf(t, "delete target %v", tgtRes.Name) - assert.Equal(t, targetArray[i].ID, tgtRes.ID) - assert.NotNil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID, &tgtRes)) + require.Equal(t, targetArray[i].ID, tgtRes.ID) + require.NotNil(t, HTTPCli.Delete("/targets/"+targetArray[i].ID, &tgtRes)) Debugf(t, "error while deleting an already deleted target %v", tgtRes.Name) } }