Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-11 05:06:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-2229: Own the full path for gluon and do not change Database path.

Browse Source
This commit is contained in:
Romain Le Jeune
2023-01-12 13:23:09 +00:00
committed by Leander Beernaert
parent 8d9db83a87
commit 0580842ad2
15 changed files with 285 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/vault/migrate_test.go
View File

@ -57,7 +57,7 @@ func TestMigrate(t *testing.T) {
require.False(t, corrupt)
// Check the migrated vault.
require.Equal(t, "v2.3.x-gluon-dir", s.GetGluonDir())
require.Equal(t, "v2.3.x-gluon-dir", s.GetGluonCacheDir())
require.Equal(t, 1234, s.GetIMAPPort())
require.Equal(t, 5678, s.GetSMTPPort())

4
internal/vault/settings.go
View File

@ -70,8 +70,8 @@ func (vault *Vault) SetSMTPSSL(ssl bool) error {
})
}
// GetGluonDir sets the directory where the gluon should store its data.
func (vault *Vault) GetGluonDir() string {
// GetGluonCacheDir sets the directory where the gluon should store its data.
func (vault *Vault) GetGluonCacheDir() string {
return vault.get().Settings.GluonDir
}

4
internal/vault/settings_test.go
View File

@ -67,13 +67,13 @@ func TestVault_Settings_GluonDir(t *testing.T) {
require.False(t, corrupt)
// Check the default gluon dir.
require.Equal(t, "/path/to/gluon", s.GetGluonDir())
require.Equal(t, "/path/to/gluon", s.GetGluonCacheDir())
// Modify the gluon dir.
require.NoError(t, s.SetGluonDir("/tmp/gluon"))
// Check the new gluon dir.
require.Equal(t, "/tmp/gluon", s.GetGluonDir())
require.Equal(t, "/tmp/gluon", s.GetGluonCacheDir())
}
func TestVault_Settings_UpdateChannel(t *testing.T) {

2
internal/vault/vault_test.go
View File

@ -89,7 +89,7 @@ func TestVault_Reset(t *testing.T) {
require.Equal(t, 5678, s.GetSMTPPort())
// Reset.
require.NoError(t, s.Reset(s.GetGluonDir()))
require.NoError(t, s.Reset(s.GetGluonCacheDir()))
// The data is gone.
require.Equal(t, 1143, s.GetIMAPPort())