larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixups for base finding (#3617)

Browse Source 
Fix:
  * return errors when told to
  * fixup timestamp issues

---

#### Does this PR need a docs update or release note?

- [ ] ✅ Yes, it's included
- [ ] 🕐 Yes, but in a later PR
- [x] ⛔ No

#### Type of change

- [ ] 🌻 Feature
- [x] 🐛 Bugfix
- [ ] 🗺️ Documentation
- [x] 🤖 Supportability/Tests
- [ ] 💻 CI/Deployment
- [ ] 🧹 Tech Debt/Cleanup

#### Issue(s)

* #3525

#### Test Plan

- [x] 💪 Manual
- [x] ⚡ Unit test
- [ ] 💚 E2E
This commit is contained in:
ashmrtn 2023-06-14 11:04:03 -07:00 committed by GitHub
parent 271c0ef0a3
commit 8996d3edab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/internal/kopia/base_finder_test.go
View File

@ -230,6 +230,10 @@ func (msm *mockSnapshotManager) LoadSnapshot(
for _, mi := range msm.data {
if mi.man.ID == id {
if mi.err != nil {
return nil, mi.err
}
return mi.man, nil
}
}
@ -259,10 +263,12 @@ func newBackupModel(
err: err,
}
if !oldDetailsID {
res.b.StreamStoreID = "ssid"
} else {
res.b.DetailsID = "ssid"
if hasDetailsSnap {
if !oldDetailsID {
res.b.StreamStoreID = "ssid"
} else {
res.b.DetailsID = "ssid"
}
}
return res
@ -393,14 +399,14 @@ func (suite *BaseFinderUnitSuite) TestGetBases() {
),
},
expectedBaseReasons: map[int][]Reason{
0: testUser1Mail,
1: testUser1Mail,
},
expectedAssistManifestReasons: map[int][]Reason{
0: testUser1Mail,
1: testUser1Mail,
},
backupData: []backupInfo{
newBackupModel(testBackup2, true, true, false, nil),
newBackupModel(testBackup1, false, false, false, assert.AnError),
newBackupModel(testBackup1, true, true, false, nil),
},
},
{
@ -427,14 +433,14 @@ func (suite *BaseFinderUnitSuite) TestGetBases() {
),
},
expectedBaseReasons: map[int][]Reason{
0: testUser1Mail,
1: testUser1Mail,
},
expectedAssistManifestReasons: map[int][]Reason{
0: testUser1Mail,
1: testUser1Mail,
},
backupData: []backupInfo{
newBackupModel(testBackup2, true, true, false, nil),
newBackupModel(testBackup1, false, false, false, assert.AnError),
newBackupModel(testBackup2, false, false, false, assert.AnError),
newBackupModel(testBackup1, true, true, false, nil),
},
},
{
@ -461,14 +467,14 @@ func (suite *BaseFinderUnitSuite) TestGetBases() {
),
},
expectedBaseReasons: map[int][]Reason{
0: testUser1Mail,
1: testUser1Mail,
},
expectedAssistManifestReasons: map[int][]Reason{
0: testUser1Mail,
1: testUser1Mail,
},
backupData: []backupInfo{
newBackupModel(testBackup2, true, true, false, nil),
newBackupModel(testBackup1, true, false, false, nil),
newBackupModel(testBackup2, true, false, false, nil),
newBackupModel(testBackup1, true, true, false, nil),
},
},
{