From d3e1ee8516c0c0b892e524717057f14780d709a0 Mon Sep 17 00:00:00 2001
From: ashmrtn <ashmrtnz@alcion.ai>
Date: Mon, 27 Feb 2023 09:41:37 -0800
Subject: [PATCH] Fix no restore permissions/backup test (#2639)

Don't restore permissions like the test says

---

#### 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

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

#### Issue(s)

* closes #2638

#### Test Plan

- [ ] :muscle: Manual
- [x] :zap: Unit test
- [ ] :green_heart: E2E
---
 .../connector/graph_connector_helper_test.go  |   1 -
 .../graph_connector_onedrive_test.go          | 102 +++++++++---------
 2 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/src/internal/connector/graph_connector_helper_test.go b/src/internal/connector/graph_connector_helper_test.go
index 7c9dbcba7..8f8a0e3b7 100644
--- a/src/internal/connector/graph_connector_helper_test.go
+++ b/src/internal/connector/graph_connector_helper_test.go
@@ -196,7 +196,6 @@ type restoreBackupInfoMultiVersion struct {
 	collectionsPrevious []colInfo
 	resource            resource
 	backupVersion       int
-	countMeta           bool
 }
 
 func attachmentEqual(
diff --git a/src/internal/connector/graph_connector_onedrive_test.go b/src/internal/connector/graph_connector_onedrive_test.go
index 864da1b08..7d8891555 100644
--- a/src/internal/connector/graph_connector_onedrive_test.go
+++ b/src/internal/connector/graph_connector_onedrive_test.go
@@ -425,7 +425,6 @@ func (suite *GraphConnectorOneDriveIntegrationSuite) TestRestoreAndBackup_Multip
 				service:             path.OneDriveService,
 				resource:            Users,
 				backupVersion:       vn,
-				countMeta:           vn == 0,
 				collectionsPrevious: input,
 				collectionsLatest:   expected,
 			}
@@ -626,7 +625,6 @@ func (suite *GraphConnectorOneDriveIntegrationSuite) TestPermissionsRestoreAndBa
 				service:             path.OneDriveService,
 				resource:            Users,
 				backupVersion:       vn,
-				countMeta:           vn == 0,
 				collectionsPrevious: input,
 				collectionsLatest:   expected,
 			}
@@ -646,8 +644,6 @@ func (suite *GraphConnectorOneDriveIntegrationSuite) TestPermissionsRestoreAndBa
 	}
 }
 
-// TODO(ashmrtn): What this test is supposed to do needs investigated. It
-// doesn't seem to do what it says.
 func (suite *GraphConnectorOneDriveIntegrationSuite) TestPermissionsBackupAndNoRestore() {
 	ctx, flush := tester.NewContext()
 	defer flush()
@@ -662,61 +658,70 @@ func (suite *GraphConnectorOneDriveIntegrationSuite) TestPermissionsBackupAndNoR
 
 	startVersion := version.OneDrive1DataAndMetaFiles
 
-	table := []onedriveTest{
+	inputCols := []onedriveColInfo{
 		{
-			startVersion: startVersion,
-			cols: []onedriveColInfo{
+			pathElements: []string{
+				"drives",
+				driveID,
+				"root:",
+			},
+			files: []itemData{
 				{
-					pathElements: []string{
-						"drives",
-						driveID,
-						"root:",
-					},
-					files: []itemData{
-						{
-							name: fileName,
-							data: fileAData,
-							perms: permData{
-								user:  suite.secondaryUser,
-								roles: writePerm,
-							},
-						},
+					name: fileName,
+					data: fileAData,
+					perms: permData{
+						user:  suite.secondaryUser,
+						roles: writePerm,
 					},
 				},
 			},
 		},
 	}
 
-	for _, test := range table {
-		expected := testDataForInfo(suite.T(), test.cols, version.Backup)
+	expectedCols := []onedriveColInfo{
+		{
+			pathElements: []string{
+				"drives",
+				driveID,
+				"root:",
+			},
+			files: []itemData{
+				{
+					// No permissions on the output since they weren't restored.
+					name: fileName,
+					data: fileAData,
+				},
+			},
+		},
+	}
 
-		for vn := test.startVersion; vn <= version.Backup; vn++ {
-			suite.Run(fmt.Sprintf("Version%d", vn), func() {
-				t := suite.T()
-				input := testDataForInfo(t, test.cols, vn)
+	expected := testDataForInfo(suite.T(), expectedCols, version.Backup)
 
-				testData := restoreBackupInfoMultiVersion{
-					service:             path.OneDriveService,
-					resource:            Users,
-					backupVersion:       vn,
-					countMeta:           vn == 0,
-					collectionsPrevious: input,
-					collectionsLatest:   expected,
-				}
+	for vn := startVersion; vn <= version.Backup; vn++ {
+		suite.Run(fmt.Sprintf("Version%d", vn), func() {
+			t := suite.T()
+			input := testDataForInfo(t, inputCols, vn)
 
-				runRestoreBackupTestVersions(
-					t,
-					suite.acct,
-					testData,
-					suite.connector.tenant,
-					[]string{suite.user},
-					control.Options{
-						RestorePermissions: true,
-						ToggleFeatures:     control.Toggles{EnablePermissionsBackup: true},
-					},
-				)
-			})
-		}
+			testData := restoreBackupInfoMultiVersion{
+				service:             path.OneDriveService,
+				resource:            Users,
+				backupVersion:       vn,
+				collectionsPrevious: input,
+				collectionsLatest:   expected,
+			}
+
+			runRestoreBackupTestVersions(
+				t,
+				suite.acct,
+				testData,
+				suite.connector.tenant,
+				[]string{suite.user},
+				control.Options{
+					RestorePermissions: false,
+					ToggleFeatures:     control.Toggles{EnablePermissionsBackup: true},
+				},
+			)
+		})
 	}
 }
 
@@ -741,7 +746,6 @@ func (suite *GraphConnectorOneDriveIntegrationSuite) TestPermissionsRestoreAndNo
 		service:       path.OneDriveService,
 		resource:      Users,
 		backupVersion: version.Backup,
-		countMeta:     false,
 		collectionsPrevious: []colInfo{
 			newOneDriveCollection(
 				suite.T(),