From 29f6582bc79cf725944a495b2158a41f821d3a76 Mon Sep 17 00:00:00 2001 From: Hitesh Pattanayak <48874082+HiteshRepo@users.noreply.github.com> Date: Fri, 2 Feb 2024 13:27:53 +0530 Subject: [PATCH] fixes failing nightly tests due to PR#5060 changes (#5176) Fixes tests failing due to change in PR #5060 #### 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 - [ ] :bug: Bugfix - [ ] :world_map: Documentation - [x] :robot: Supportability/Tests - [ ] :computer: CI/Deployment - [ ] :broom: Tech Debt/Cleanup #### Issue(s) - https://github.com/alcionai/corso/actions/runs/7736081427 - https://github.com/alcionai/corso/actions/runs/7751227007 #### Test Plan - [x] :muscle: Manual - [x] :zap: Unit test - [x] :green_heart: E2E --- src/cli/repo/filesystem_e2e_test.go | 5 ++--- src/cli/repo/s3_e2e_test.go | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/cli/repo/filesystem_e2e_test.go b/src/cli/repo/filesystem_e2e_test.go index 59ef92b63..300bd2d53 100644 --- a/src/cli/repo/filesystem_e2e_test.go +++ b/src/cli/repo/filesystem_e2e_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/alcionai/clues" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" @@ -82,9 +81,9 @@ func (suite *FilesystemE2ESuite) TestInitFilesystemCmd() { err = cmd.ExecuteContext(ctx) require.NoError(t, err, clues.ToCore(err)) - // a second initialization should result in an error + // noop err = cmd.ExecuteContext(ctx) - assert.ErrorIs(t, err, repository.ErrorRepoAlreadyExists, clues.ToCore(err)) + require.NoError(t, err, clues.ToCore(err)) }) } } diff --git a/src/cli/repo/s3_e2e_test.go b/src/cli/repo/s3_e2e_test.go index 6bb7f4ee9..c667f7538 100644 --- a/src/cli/repo/s3_e2e_test.go +++ b/src/cli/repo/s3_e2e_test.go @@ -89,9 +89,9 @@ func (suite *S3E2ESuite) TestInitS3Cmd() { err = cmd.ExecuteContext(ctx) require.NoError(t, err, clues.ToCore(err)) - // a second initialization should result in an error + // noop err = cmd.ExecuteContext(ctx) - assert.ErrorIs(t, err, repository.ErrorRepoAlreadyExists, clues.ToCore(err)) + require.NoError(t, err, clues.ToCore(err)) }) } } @@ -116,8 +116,7 @@ func (suite *S3E2ESuite) TestInitMultipleTimes() { "repo", "init", "s3", "--"+flags.ConfigFileFN, configFP, "--bucket", cfg.Bucket, - "--prefix", cfg.Prefix, - "--succeed-if-exists") + "--prefix", cfg.Prefix) cli.BuildCommandTree(cmd) // run the command