Skip to content

Commit faebed1

Browse files
authored
Disable rate limit for local acceptance tests; increase for cloud (#3581)
## Changes Respect DATABRICKS_RATE_LIMIT variable and pass it to tests if set. If not set, set to higher defaults depending on local/cloud. Related: #3579 ## Tests New acc test with parallel resources that is good to demo the difference. Manually try different rate limits: Set a very low limit: ``` ~/work/cli-main/acceptance/bundle/resources/independent % DATABRICKS_RATE_LIMIT=1 testme -v -count=1 + go test ../../.. -run ^TestAccept$/^bundle$/^resources$/^independent$ -v -count=1 … --- PASS: TestAccept/bundle/resources/independent/DATABRICKS_CLI_DEPLOYMENT=direct-exp (16.47s) --- PASS: TestAccept/bundle/resources/independent/DATABRICKS_CLI_DEPLOYMENT=terraform (22.34s) ``` Restore SDK default: ``` ~/work/cli-main/acceptance/bundle/resources/independent % DATABRICKS_RATE_LIMIT=15 testme -v -count=1 + go test ../../.. -run ^TestAccept$/^bundle$/^resources$/^independent$ -v -count=1 --- PASS: TestAccept/bundle/resources/independent/DATABRICKS_CLI_DEPLOYMENT=direct-exp (1.52s) --- PASS: TestAccept/bundle/resources/independent/DATABRICKS_CLI_DEPLOYMENT=terraform (5.02s) ``` New default: ``` ~/work/cli-main/acceptance/bundle/resources/independent % testme -v -count=1 + go test ../../.. -run ^TestAccept$/^bundle$/^resources$/^independent$ -v -count=1 --- PASS: TestAccept/bundle/resources/independent/DATABRICKS_CLI_DEPLOYMENT=direct-exp (0.46s) --- PASS: TestAccept/bundle/resources/independent/DATABRICKS_CLI_DEPLOYMENT=terraform (2.36s) ```
1 parent 9515c21 commit faebed1

File tree

7 files changed

+52
-0
lines changed

7 files changed

+52
-0
lines changed

acceptance/acceptance_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,16 @@ func runTest(t *testing.T,
581581
testdiff.PrepareReplacementsWorkspaceConfig(t, &repls, cfg)
582582

583583
cmd.Env = auth.ProcessEnv(cfg)
584+
585+
rateLimit := os.Getenv("DATABRICKS_RATE_LIMIT")
586+
if rateLimit == "" {
587+
if isRunningOnCloud {
588+
rateLimit = "100"
589+
} else {
590+
rateLimit = "1000000000"
591+
}
592+
}
593+
cmd.Env = append(cmd.Env, "DATABRICKS_RATE_LIMIT="+rateLimit)
584594
cmd.Env = append(cmd.Env, "UNIQUE_NAME="+uniqueName)
585595
cmd.Env = append(cmd.Env, "TEST_TMP_DIR="+tmpDir)
586596

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# independent resources
2+
3+
resources:
4+
jobs:
5+
foo:
6+
name: foo
7+
8+
trigger:
9+
periodic:
10+
interval: 1
11+
unit: DAYS
12+
13+
job_clusters:
14+
- job_cluster_key: key
15+
new_cluster:
16+
spark_version: 13.3.x-scala2.12
17+
18+
pipelines:
19+
my:
20+
name: test-pipeline
21+
libraries:
22+
- file:
23+
path: "./foo.py"
24+
25+
volumes:
26+
volume1:
27+
catalog_name: main
28+
schema_name: myschema
29+
name: myvolume
30+
comment: COMMENT1

acceptance/bundle/resources/independent/foo.py

Whitespace-only changes.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Local = true
2+
Cloud = false
3+
4+
[EnvMatrix]
5+
DATABRICKS_CLI_DEPLOYMENT = ["terraform", "direct-exp"]
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
2+
Deploying resources...
3+
Updating deployment state...
4+
Deployment complete!
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
$CLI bundle deploy
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
RecordRequests = false
2+
Timeout = "120s"

0 commit comments

Comments
 (0)