TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-12 05:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

tailscale: update tailfs functions and vars to use drive naming (#11597)

Browse Source 
This change updates all tailfs functions and the majority of the tailfs
variables to use the new drive naming.

Updates tailscale/corp#16827

Signed-off-by: Charlotte Brandhorst-Satzkorn <charlotte@tailscale.com>
This commit is contained in:
Charlotte Brandhorst-Satzkorn
2024-04-03 10:09:58 -07:00
committed by GitHub
parent 2409661a0d
commit 93618a3518
27 changed files with 233 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ipn/ipnlocal/local_test.go
View File

@@ -2295,12 +2295,12 @@ func TestTCPHandlerForDst(t *testing.T) {
intercept: false,
},
{
desc: "intercept port 8080 (TailFS) on quad100 IPv4",
desc: "intercept port 8080 (Taildrive) on quad100 IPv4",
dst: "100.100.100.100:8080",
intercept: true,
},
{
desc: "intercept port 8080 (TailFS) on quad100 IPv6",
desc: "intercept port 8080 (Taildrive) on quad100 IPv6",
dst: "[fd7a:115c:a1e0::53]:8080",
intercept: true,
},
@@ -2340,7 +2340,7 @@ func TestTCPHandlerForDst(t *testing.T) {
}
}
func TestTailFSManageShares(t *testing.T) {
func TestDriveManageShares(t *testing.T) {
tests := []struct {
name string
disabled bool
@@ -2410,7 +2410,7 @@ func TestTailFSManageShares(t *testing.T) {
name: "add_disabled",
disabled: true,
add: &drive.Share{Name: "a"},
expect: ErrTailFSNotEnabled,
expect: ErrDriveNotEnabled,
},
{
name: "remove",
@@ -2439,7 +2439,7 @@ func TestTailFSManageShares(t *testing.T) {
name: "remove_disabled",
disabled: true,
remove: "b",
expect: ErrTailFSNotEnabled,
expect: ErrDriveNotEnabled,
},
{
name: "rename",
@@ -2480,7 +2480,7 @@ func TestTailFSManageShares(t *testing.T) {
name: "rename_disabled",
disabled: true,
rename: [2]string{"a", "c"},
expect: ErrTailFSNotEnabled,
expect: ErrDriveNotEnabled,
},
}
@@ -2494,7 +2494,7 @@ func TestTailFSManageShares(t *testing.T) {
b := newTestBackend(t)
b.mu.Lock()
if tt.existing != nil {
b.tailFSSetSharesLocked(tt.existing)
b.driveSetSharesLocked(tt.existing)
}
if !tt.disabled {
self := b.netMap.SelfNode.AsStruct()
@@ -2517,7 +2517,7 @@ func TestTailFSManageShares(t *testing.T) {
func() { wg.Done() },
func(n *ipn.Notify) bool {
select {
case result <- n.TailFSShares:
case result <- n.DriveShares:
default:
//
}
@@ -2529,11 +2529,11 @@ func TestTailFSManageShares(t *testing.T) {
var err error
switch {
case tt.add != nil:
err = b.TailFSSetShare(tt.add)
err = b.DriveSetShare(tt.add)
case tt.remove != "":
err = b.TailFSRemoveShare(tt.remove)
err = b.DriveRemoveShare(tt.remove)
default:
err = b.TailFSRenameShare(tt.rename[0], tt.rename[1])
err = b.DriveRenameShare(tt.rename[0], tt.rename[1])
}
switch e := tt.expect.(type) {