Browse Source

ipn/ipnlocal: delete redundant TestStatusWithoutPeers

We have tstest/integration nowadays.

And this test was one of the lone holdouts using the to-be-nuked
SetControlClientGetterForTesting.

Updates #11649

Change-Id: Icf8a6a2e9b8ae1ac534754afa898c00dc0b7623b
Signed-off-by: Brad Fitzpatrick <[email protected]>
Brad Fitzpatrick 1 năm trước cách đây
mục cha
commit
8186cd0349
2 tập tin đã thay đổi với 5 bổ sung28 xóa
  1. 0 28
      ipn/ipnlocal/local_test.go
  2. 5 0
      tstest/integration/integration_test.go

+ 0 - 28
ipn/ipnlocal/local_test.go

@@ -763,34 +763,6 @@ func TestPacketFilterPermitsUnlockedNodes(t *testing.T) {
 	}
 }
 
-func TestStatusWithoutPeers(t *testing.T) {
-	b := newTestLocalBackend(t)
-
-	var cc *mockControl
-	b.SetControlClientGetterForTesting(func(opts controlclient.Options) (controlclient.Client, error) {
-		cc = newClient(t, opts)
-
-		t.Logf("ccGen: new mockControl.")
-		cc.called("New")
-		return cc, nil
-	})
-	b.Start(ipn.Options{})
-	b.StartLoginInteractive()
-	cc.send(nil, "", false, &netmap.NetworkMap{
-		SelfNode: (&tailcfg.Node{
-			MachineAuthorized: true,
-			Addresses:         ipps("100.101.101.101"),
-		}).View(),
-	})
-	got := b.StatusWithoutPeers()
-	if got.TailscaleIPs == nil {
-		t.Errorf("got nil, expected TailscaleIPs value to not be nil")
-	}
-	if !reflect.DeepEqual(got.TailscaleIPs, got.Self.TailscaleIPs) {
-		t.Errorf("got %v, expected %v", got.TailscaleIPs, got.Self.TailscaleIPs)
-	}
-}
-
 func TestStatusPeerCapabilities(t *testing.T) {
 	tests := []struct {
 		name                     string

+ 5 - 0
tstest/integration/integration_test.go

@@ -382,6 +382,11 @@ func TestTwoNodes(t *testing.T) {
 		if peer.ID == st.Self.ID {
 			return errors.New("peer is self")
 		}
+
+		if len(st.TailscaleIPs) == 0 {
+			return errors.New("no Tailscale IPs")
+		}
+
 		return nil
 	}); err != nil {
 		t.Error(err)