TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update a Taildrop error message (#4818)

Browse Source 
ipn/ipnlocal: update error message on Taildrop send while not connected

Signed-off-by: Praneet <1466314+praneetloke@users.noreply.github.com>
This commit is contained in:
Praneet Loke 2022-06-08 09:11:50 -07:00 committed by GitHub
parent d3643fa151
commit d8c05fc1b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/local.go
View File

@ -3108,7 +3108,7 @@ func (b *LocalBackend) FileTargets() ([]*apitype.FileTarget, error) {
defer b.mu.Unlock() defer b.mu.Unlock()
nm := b.netMap nm := b.netMap
if b.state != ipn.Running || nm == nil { if b.state != ipn.Running || nm == nil {
return nil, errors.New("not connected") return nil, errors.New("not connected to the tailnet")
} }
if !b.capFileSharing { if !b.capFileSharing {
return nil, errors.New("file sharing not enabled by Tailscale admin") return nil, errors.New("file sharing not enabled by Tailscale admin")

4
ipn/ipnlocal/local_test.go
View File

@ -511,13 +511,13 @@ func TestLazyMachineKeyGeneration(t *testing.T) {
func TestFileTargets(t *testing.T) { func TestFileTargets(t *testing.T) {
b := new(LocalBackend) b := new(LocalBackend)
_, err := b.FileTargets() _, err := b.FileTargets()
if got, want := fmt.Sprint(err), "not connected"; got != want { if got, want := fmt.Sprint(err), "not connected to the tailnet"; got != want {
t.Errorf("before connect: got %q; want %q", got, want) t.Errorf("before connect: got %q; want %q", got, want)
} }
b.netMap = new(netmap.NetworkMap) b.netMap = new(netmap.NetworkMap)
_, err = b.FileTargets() _, err = b.FileTargets()
if got, want := fmt.Sprint(err), "not connected"; got != want { if got, want := fmt.Sprint(err), "not connected to the tailnet"; got != want {
t.Errorf("non-running netmap: got %q; want %q", got, want) t.Errorf("non-running netmap: got %q; want %q", got, want)
} }