Skip to content

acc: Add CloudSlow config setting #2470

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
denik merged 4 commits into from
Mar 11, 2025
Merged

acc: Add CloudSlow config setting #2470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e02c5f
Add CloudLong config setting
denik Mar 10, 2025
027057d
update a comment
denik Mar 11, 2025
08edbff
fix error message
denik Mar 11, 2025
d47217f
refactor: Rename CloudLong to CloudSlow in acceptance tests
denik Mar 11, 2025
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
46 changes: 34 additions & 12 deletions acceptance/acceptance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,17 +220,39 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
}

cloudEnv := os.Getenv("CLOUD_ENV")
if !isTruePtr(config.Local) && cloudEnv == "" {
t.Skipf("Disabled via Local setting in %s (CLOUD_ENV=%s)", configPath, cloudEnv)
}
isRunningOnCloud := cloudEnv != ""
tailOutput := Tail

if !isTruePtr(config.Cloud) && cloudEnv != "" {
t.Skipf("Disabled via Cloud setting in %s (CLOUD_ENV=%s)", configPath, cloudEnv)
}
if isRunningOnCloud {
if isTruePtr(config.CloudSlow) {
if testing.Short() {
t.Skipf("Disabled via CloudSlow setting in %s (CLOUD_ENV=%s, Short=%v)", configPath, cloudEnv, testing.Short())
}

if testing.Verbose() {
// Combination of CloudSlow and -v auto-enables -tail
tailOutput = true
Copy link
Copy Markdown
Contributor

@shreyas-goenka shreyas-goenka Mar 11, 2025

Choose a reason for hiding this comment

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

Unrelated, but tailing the output can be the default behaviour for all tests.

Copy link
Copy Markdown
Contributor Author

@denik denik Mar 11, 2025

Choose a reason for hiding this comment

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

I don't think it's needed, since we already record it and show a diff, it's only useful to monitor and review timestamps of long running tests.

}
}

isCloudEnabled := isTruePtr(config.Cloud) || isTruePtr(config.CloudSlow)
if !isCloudEnabled {
t.Skipf("Disabled via Cloud/CloudSlow setting in %s (CLOUD_ENV=%s, Cloud=%v, CloudSlow=%v)",
configPath,
cloudEnv,
isTruePtr(config.Cloud),
isTruePtr(config.CloudSlow),
)
}

if cloudEnv != "" {
if isTruePtr(config.RequiresUnityCatalog) && os.Getenv("TEST_METASTORE_ID") == "" {
t.Skipf("Skipping on non-UC workspaces")
t.Skipf("Disabled via RequiresUnityCatalog setting in %s (TEST_METASTORE_ID=%s)", configPath, os.Getenv("TEST_METASTORE_ID"))
}

} else {
// Local run
if !isTruePtr(config.Local) {
t.Skipf("Disabled via Local setting in %s (CLOUD_ENV=%s)", configPath, cloudEnv)
}
}

Expand Down Expand Up @@ -267,7 +289,7 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
// specifies a custom server stubs.
var server *testserver.Server

if cloudEnv == "" {
if !isRunningOnCloud {
// Start a new server for this test if either:
// 1. A custom server spec is defined in the test configuration.
// 2. The test is configured to record requests and assert on them. We need
Expand Down Expand Up @@ -374,7 +396,7 @@ func runTest(t *testing.T, dir, coverDir string, repls testdiff.ReplacementsCont
require.NoError(t, err)
defer out.Close()

err = runWithLog(t, cmd, out)
err = runWithLog(t, cmd, out, tailOutput)

// Include exit code in output (if non-zero)
formatOutput(out, err)
Expand Down Expand Up @@ -725,7 +747,7 @@ func isTruePtr(value *bool) bool {
return value != nil && *value
}

func runWithLog(t *testing.T, cmd *exec.Cmd, out *os.File) error {
func runWithLog(t *testing.T, cmd *exec.Cmd, out *os.File, tail bool) error {
r, w := io.Pipe()
cmd.Stdout = w
cmd.Stderr = w
Expand All @@ -743,7 +765,7 @@ func runWithLog(t *testing.T, cmd *exec.Cmd, out *os.File) error {
reader := bufio.NewReader(r)
for {
line, err := reader.ReadString('\n')
if Tail {
if tail {
msg := strings.TrimRight(line, "\n")
if len(msg) > 0 {
d := time.Since(start)
Expand Down
4 changes: 4 additions & 0 deletions acceptance/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ type TestConfig struct {
// If true, run this test when running with cloud env configured
Cloud *bool

// If true, run this test when running with cloud env configured and -short is not passed
// This also sets -tail when -v is passed.
CloudSlow *bool

// If true and Cloud=true, run this test only if unity catalog is available in the cloud environment
RequiresUnityCatalog *bool

Expand Down
Loading