Skip to content

Remove calls to t.Setenv from integration tests #2018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pietern merged 11 commits into from
Dec 16, 2024
Merged

Remove calls to t.Setenv from integration tests #2018

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
164eda3
Pass 1
pietern Dec 13, 2024
c180cce
Pass 2
pietern Dec 13, 2024
b88dedd
Pass 3
pietern Dec 13, 2024
e5fff5c
Use env package to set BUNDLE_ROOT
pietern Dec 13, 2024
5e755e8
Pass ctx to cmdio.NewIO
pietern Dec 13, 2024
ef35ead
Use env package to get environment variables in cmdio.NewIO
pietern Dec 13, 2024
d7b6f88
Use env package to set TERM
pietern Dec 13, 2024
d42dc35
Don't use t.Setenv from blackBoxRun
pietern Dec 16, 2024
fa6285d
Fix
pietern Dec 16, 2024
35dc5c4
Drop 'WithContext' suffix now that it is the default
pietern Dec 16, 2024
c2f8952
Use fixture helpers from TestFetchRepositoryInfoAPI
pietern Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions integration/libs/git/git_fetch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ import (
"os/exec"
"path"
"path/filepath"
"strings"
"testing"

"github.com/databricks/cli/internal/acc"
"github.com/databricks/cli/internal/testcli"
"github.com/databricks/cli/internal/testutil"
"github.com/databricks/cli/libs/dbr"
"github.com/databricks/cli/libs/git"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -39,19 +38,18 @@ func assertSparseGitInfo(t *testing.T, expectedRoot string, info git.RepositoryI
assert.Equal(t, expectedRoot, info.WorktreeRoot)
}

func ensureWorkspacePrefix(root string) string {
// The fixture helper doesn't include /Workspace, so include it here.
Copy link
Contributor

@denik denik Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not fix the fixture helper instead to generate right path?

Copy link
Contributor Author

@pietern pietern Dec 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried this but there are assumptions elsewhere on the prefix not being included.

I'd like to address this in a separate PR and normalize on having the /Workspace prefix everywhere.

if !strings.HasPrefix(root, "/Workspace/") {
return path.Join("/Workspace", root)
}
return root
}

func TestFetchRepositoryInfoAPI_FromRepo(t *testing.T) {
ctx, wt := acc.WorkspaceTest(t)
me, err := wt.W.CurrentUser.Me(ctx)
require.NoError(t, err)
targetPath := ensureWorkspacePrefix(acc.TemporaryRepo(wt, examplesRepoUrl))

targetPath := testutil.RandomName(path.Join("/Workspace/Users", me.UserName, "/testing-clone-bundle-examples-"))
stdout, stderr := testcli.RequireSuccessfulRun(t, ctx, "repos", "create", examplesRepoUrl, examplesRepoProvider, "--path", targetPath)
t.Cleanup(func() {
testcli.RequireSuccessfulRun(t, ctx, "repos", "delete", targetPath)
})

assert.Empty(t, stderr.String())
assert.NotEmpty(t, stdout.String())
ctx = dbr.MockRuntime(ctx, true)

for _, inputPath := range []string{
Expand All @@ -68,16 +66,12 @@ func TestFetchRepositoryInfoAPI_FromRepo(t *testing.T) {

func TestFetchRepositoryInfoAPI_FromNonRepo(t *testing.T) {
ctx, wt := acc.WorkspaceTest(t)
me, err := wt.W.CurrentUser.Me(ctx)
require.NoError(t, err)
rootPath := ensureWorkspacePrefix(acc.TemporaryWorkspaceDir(wt, "testing-nonrepo-"))

rootPath := testutil.RandomName(path.Join("/Workspace/Users", me.UserName, "testing-nonrepo-"))
_, stderr := testcli.RequireSuccessfulRun(t, ctx, "workspace", "mkdirs", path.Join(rootPath, "a/b/c"))
t.Cleanup(func() {
testcli.RequireSuccessfulRun(t, ctx, "workspace", "delete", "--recursive", rootPath)
})
// Create directory inside this root path (this is cleaned up as part of the root path).
err := wt.W.Workspace.MkdirsByPath(ctx, path.Join(rootPath, "a/b/c"))
require.NoError(t, err)

assert.Empty(t, stderr.String())
ctx = dbr.MockRuntime(ctx, true)

tests := []struct {
Expand Down
Loading