Skip to content
Snippets Groups Projects
Commit aaafcb35 authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Fix backup tests

parent fd282d73
Branches
Tags
3 merge requests!510Release,!232Modify restructure branch to make it ready for merge to release,!207WIP: Client Restructure
...@@ -138,7 +138,7 @@ func InitializeBackup(password string, updateBackupCb UpdateBackupFn, ...@@ -138,7 +138,7 @@ func InitializeBackup(password string, updateBackupCb UpdateBackupFn,
func ResumeBackup(updateBackupCb UpdateBackupFn, container *messenger.Container, func ResumeBackup(updateBackupCb UpdateBackupFn, container *messenger.Container,
e2e E2e, session Session, ud UserDiscovery, kv *versioned.KV, e2e E2e, session Session, ud UserDiscovery, kv *versioned.KV,
rng *fastRNG.StreamGenerator) (*Backup, error) { rng *fastRNG.StreamGenerator) (*Backup, error) {
_, _, _, err := loadBackup(store.GetKV()) _, _, _, err := loadBackup(kv)
if err != nil { if err != nil {
return nil, err return nil, err
} }
......
...@@ -113,7 +113,7 @@ func Test_ResumeBackup(t *testing.T) { ...@@ -113,7 +113,7 @@ func Test_ResumeBackup(t *testing.T) {
} }
// Get key, salt, and parameters of resumed backup // Get key, salt, and parameters of resumed backup
key2, salt2, _, err := loadBackup(b.store.GetKV()) key2, salt2, _, err := loadBackup(b.kv)
if err != nil { if err != nil {
t.Errorf("Failed to load key, salt, and params from resumed "+ t.Errorf("Failed to load key, salt, and params from resumed "+
"backup: %+v", err) "backup: %+v", err)
...@@ -148,7 +148,9 @@ func Test_ResumeBackup(t *testing.T) { ...@@ -148,7 +148,9 @@ func Test_ResumeBackup(t *testing.T) {
func Test_resumeBackup_NoKeyError(t *testing.T) { func Test_resumeBackup_NoKeyError(t *testing.T) {
expectedErr := "object not found" expectedErr := "object not found"
s := storage.InitTestingSession(t) s := storage.InitTestingSession(t)
_, err := resumeBackup(nil, nil, s, &interfaces.BackupContainer{}, nil) rngGen := fastRNG.NewStreamGenerator(1000, 10, csprng.NewSystemRNG)
_, err := ResumeBackup(nil, &messenger.Container{}, newMockE2e(t), newMockSession(t),
newMockUserDiscovery(), s.GetKV(), rngGen)
if err == nil || !strings.Contains(err.Error(), expectedErr) { if err == nil || !strings.Contains(err.Error(), expectedErr) {
t.Errorf("ResumeBackup did not return the expected error when no "+ t.Errorf("ResumeBackup did not return the expected error when no "+
"password is present.\nexpected: %s\nreceived: %+v", expectedErr, err) "password is present.\nexpected: %s\nreceived: %+v", expectedErr, err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment