yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-2229: Allow changing cache folder to a non-empty folder.

Browse Source
This commit is contained in:
Romain Le Jeune
2023-01-10 16:40:52 +00:00
parent 407c9fe1a6
commit b19e16e4b8
15 changed files with 187 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
internal/bridge/bridge_test.go
View File

@ -23,7 +23,7 @@ import (
"fmt"
"net/http"
"os"
"runtime"
"path/filepath"
"sync"
"testing"
"time"
@ -361,7 +361,7 @@ func TestBridge_MissingGluonDir(t *testing.T) {
require.NoError(t, bridge.SetGluonDir(ctx, t.TempDir()))
// Get the gluon dir.
gluonDir = bridge.GetGluonDir()
gluonDir = bridge.GetGluonCacheDir()
})
// The user removes the gluon dir while bridge is not running.
@ -456,24 +456,11 @@ func TestBridge_FactoryReset(t *testing.T) {
})
}
func TestBridge_ChangeCacheDirectoryFailsBetweenDifferentVolumes(t *testing.T) {
if runtime.GOOS != "windows" {
t.Skip("Test only necessary on windows")
}
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, vaultKey []byte) {
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
// Change directory
err := bridge.SetGluonDir(ctx, "XX:\\")
require.Error(t, err)
})
})
}
func TestBridge_ChangeCacheDirectory(t *testing.T) {
withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, vaultKey []byte) {
withBridge(ctx, t, s.GetHostURL(), netCtl, locator, vaultKey, func(bridge *bridge.Bridge, mocks *bridge.Mocks) {
newCacheDir := t.TempDir()
currentCacheDir := bridge.GetGluonDir()
currentCacheDir := bridge.GetGluonCacheDir()
// Login the user.
userID, err := bridge.LoginFull(ctx, username, password, nil, nil)
@ -490,7 +477,7 @@ func TestBridge_ChangeCacheDirectory(t *testing.T) {
_, err = os.ReadDir(currentCacheDir)
require.True(t, os.IsNotExist(err))
require.Equal(t, newCacheDir, bridge.GetGluonDir())
require.Equal(t, filepath.Join(newCacheDir, "gluon"), bridge.GetGluonCacheDir())
})
})
}