From 8996d3edab739b40655a02378c715440459cf6c2 Mon Sep 17 00:00:00 2001
From: ashmrtn <3891298+ashmrtn@users.noreply.github.com>
Date: Wed, 14 Jun 2023 11:04:03 -0700
Subject: [PATCH] Minor fixups for base finding (#3617)

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

---

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

- [ ] :white_check_mark: Yes, it's included
- [ ] :clock1: Yes, but in a later PR
- [x] :no_entry: No

#### Type of change

- [ ] :sunflower: Feature
- [x] :bug: Bugfix
- [ ] :world_map: Documentation
- [x] :robot: Supportability/Tests
- [ ] :computer: CI/Deployment
- [ ] :broom: Tech Debt/Cleanup

#### Issue(s)

* #3525

#### Test Plan

- [x] :muscle: Manual
- [x] :zap: Unit test
- [ ] :green_heart: E2E
---
 src/internal/kopia/base_finder_test.go | 36 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/internal/kopia/base_finder_test.go b/src/internal/kopia/base_finder_test.go
index bf8110c23..ff3d5f0c1 100644
--- a/src/internal/kopia/base_finder_test.go
+++ b/src/internal/kopia/base_finder_test.go
@@ -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),
 			},
 		},
 		{