Просмотр исходного кода

tstest/integration: add --accept-risk=all to tailscale down

The test would fail if I was running it over SSH.

Signed-off-by: Maisem Ali <[email protected]>
Maisem Ali 3 лет назад
Родитель
Сommit
41dd49391f
2 измененных файлов с 3 добавлено и 2 удалено
  1. 2 1
      cmd/tailscale/cli/risks.go
  2. 1 1
      tstest/integration/integration_test.go

+ 2 - 1
cmd/tailscale/cli/risks.go

@@ -18,6 +18,7 @@ import (
 var (
 	riskTypes   []string
 	riskLoseSSH = registerRiskType("lose-ssh")
+	riskAll     = registerRiskType("all")
 )
 
 func registerRiskType(riskType string) string {
@@ -35,7 +36,7 @@ func registerAcceptRiskFlag(f *flag.FlagSet, acceptedRisks *string) {
 // risks in acceptedRisks.
 func isRiskAccepted(riskType, acceptedRisks string) bool {
 	for _, r := range strings.Split(acceptedRisks, ",") {
-		if r == riskType {
+		if r == riskType || r == riskAll {
 			return true
 		}
 	}

+ 1 - 1
tstest/integration/integration_test.go

@@ -846,7 +846,7 @@ func (n *testNode) MustUp(extraArgs ...string) {
 func (n *testNode) MustDown() {
 	t := n.env.t
 	t.Logf("Running down ...")
-	if err := n.Tailscale("down").Run(); err != nil {
+	if err := n.Tailscale("down", "--accept-risk=all").Run(); err != nil {
 		t.Fatalf("down: %v", err)
 	}
 }