Skip to content

Commit fc89281

Browse files
terzioglubterzioglub
authored
Merge pull request bruin-data#369 from bruin-data/run-tests-dif-env
 run tests in dif environments
2 parents e6645fe + fa5f86e commit fc89281

36 files changed

+573
-314
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ glossary.yaml
140140
# pixi dev env
141141
.pixi
142142

143+
integration-tests/duckdb-files
143144
integration-tests/duckdb.db
144145
integration-tests/logs
145146
integration-tests/bruin

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ build: deps
2323
@CGO_ENABLED=1 go build -v -tags="no_duckdb_arrow" -ldflags="-s -w -X main.Version=$(or $(tag), dev-$(shell git describe --tags --abbrev=0)) -X main.TelemetryKey=$(TELEMETRY_KEY)" -o "$(BUILD_DIR)/$(NAME)" "$(BUILD_SRC)"
2424

2525
integration-test: build
26+
@rm -rf integration-tests/duckdb-files # Clean up the directory if it exists
27+
@mkdir -p integration-tests/duckdb-files # Recreate the directory
2628
@touch integration-tests/.git
2729
@touch integration-tests/bruin
28-
@touch integration-tests/duckdb.db
2930
@rm -rf integration-tests/.git
30-
@rm integration-tests/bruin
31-
@rm integration-tests/duckdb.db
31+
@rm integration-tests/bruin
3232
@echo "$(OK_COLOR)==> Running integration tests...$(NO_COLOR)"
3333
@cd integration-tests && git init
3434
@go run integration-tests/integration-test.go

‎integration-tests/.bruin.yml

+99-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,110 @@ environments:
44
connections:
55
duckdb:
66
- name: "duckdb-default"
7-
path: "duckdb.db"
7+
path: "duckdb-files/duckdb.db"
88
chess:
99
- name: "chess-default"
1010
players:
1111
- "MagnusCarlsen"
1212
- "Hikaru"
13+
generic:
14+
- name: KEY1
15+
value: value1
16+
17+
env-run-with-filters:
18+
connections:
19+
duckdb:
20+
- name: "duckdb-run-with-filters"
21+
path: "duckdb-files/run-with-filters.db"
22+
chess:
23+
- name: "chess-run-with-filters"
24+
players:
25+
- "MagnusCarlsen"
26+
- "Hikaru"
27+
generic:
28+
- name: KEY1
29+
value: value1
30+
env-run-with-tags:
31+
connections:
32+
duckdb:
33+
- name: "duckdb-run-with-tags"
34+
path: "duckdb-files/run-with-tags.db"
35+
chess:
36+
- name: "chess-run-with-tags"
37+
players:
38+
- "MagnusCarlsen"
39+
- "Hikaru"
40+
generic:
41+
- name: KEY1
42+
value: value1
43+
env-run-main-with-filters:
44+
connections:
45+
duckdb:
46+
- name: "duckdb-run-main-with-filters"
47+
path: "duckdb-files/run-main-with-filters.db"
48+
chess:
49+
- name: "chess-run-main-with-filters"
50+
players:
51+
- "MagnusCarlsen"
52+
- "Hikaru"
53+
generic:
54+
- name: KEY1
55+
value: value1
56+
57+
env-run-with-downstream:
58+
connections:
59+
duckdb:
60+
- name: "duckdb-run-with-downstream"
61+
path: "duckdb-files/run-with-downstream.db"
62+
chess:
63+
- name: "chess-run-with-downstream"
64+
players:
65+
- "MagnusCarlsen"
66+
- "Hikaru"
67+
generic:
68+
- name: KEY1
69+
value: value1
70+
env-run-main-with-downstream:
71+
connections:
72+
duckdb:
73+
- name: "duckdb-run-main-with-downstream"
74+
path: "duckdb-files/run-main-with-downstream.db"
75+
chess:
76+
- name: "chess-run-main-with-downstream"
77+
players:
78+
- "MagnusCarlsen"
79+
- "Hikaru"
80+
generic:
81+
- name: KEY1
82+
value: value1
83+
env-push-metadata:
84+
connections:
85+
duckdb:
86+
- name: "duckdb-push-metadata"
87+
path: "duckdb-files/push-metadata.db"
88+
env-run-use-uv:
89+
connections:
90+
duckdb:
91+
- name: "duckdb-env-run-use-uv"
92+
path: "duckdb-files/env-run-use-uv.db"
93+
chess:
94+
- name: "chess-run-use-uv"
95+
players:
96+
- "MagnusCarlsen"
97+
- "Hikaru"
98+
generic:
99+
- name: KEY1
100+
value: value1
101+
env-run-malformed-sql:
102+
connections:
103+
duckdb:
104+
- name: "duckdb-run-malformed-sql"
105+
path: "duckdb-files/run-malformed-sql.db"
106+
chess:
107+
- name: "chess-run-malformed-sql"
108+
players:
109+
- "MagnusCarlsen"
110+
- "Hikaru"
13111
generic:
14112
- name: KEY1
15113
value: value1

‎integration-tests/expected_connections.json

+188-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"duckdb": [
1313
{
1414
"name": "duckdb-default",
15-
"path": "duckdb.db"
15+
"path": "duckdb-files/duckdb.db"
1616
}
1717
],
1818
"chess": [
@@ -38,7 +38,7 @@
3838
"duckdb": [
3939
{
4040
"name": "duckdb-default",
41-
"path": "duckdb.db"
41+
"path": "duckdb-files/duckdb.db"
4242
}
4343
],
4444
"chess": [
@@ -51,6 +51,191 @@
5151
}
5252
]
5353
}
54+
},
55+
"env-run-with-filters": {
56+
"connections": {
57+
"generic": [
58+
{
59+
"name": "KEY1",
60+
"value": "value1"
61+
}
62+
],
63+
"duckdb": [
64+
{
65+
"name": "duckdb-run-with-filters",
66+
"path": "duckdb-files/run-with-filters.db"
67+
}
68+
],
69+
"chess": [
70+
{
71+
"name": "chess-run-with-filters",
72+
"players": [
73+
"MagnusCarlsen",
74+
"Hikaru"
75+
]
76+
}
77+
]
78+
}
79+
},
80+
"env-run-with-tags": {
81+
"connections": {
82+
"generic": [
83+
{
84+
"name": "KEY1",
85+
"value": "value1"
86+
}
87+
],
88+
"duckdb": [
89+
{
90+
"name": "duckdb-run-with-tags",
91+
"path": "duckdb-files/run-with-tags.db"
92+
}
93+
],
94+
"chess": [
95+
{
96+
"name": "chess-run-with-tags",
97+
"players": [
98+
"MagnusCarlsen",
99+
"Hikaru"
100+
]
101+
}
102+
]
103+
}
104+
},
105+
"env-run-main-with-filters": {
106+
"connections": {
107+
"generic": [
108+
{
109+
"name": "KEY1",
110+
"value": "value1"
111+
}
112+
],
113+
"duckdb": [
114+
{
115+
"name": "duckdb-run-main-with-filters",
116+
"path": "duckdb-files/run-main-with-filters.db"
117+
}
118+
],
119+
"chess": [
120+
{
121+
"name": "chess-run-main-with-filters",
122+
"players": [
123+
"MagnusCarlsen",
124+
"Hikaru"
125+
]
126+
}
127+
]
128+
}
129+
},
130+
"env-run-with-downstream": {
131+
"connections": {
132+
"generic": [
133+
{
134+
"name": "KEY1",
135+
"value": "value1"
136+
}
137+
],
138+
"duckdb": [
139+
{
140+
"name": "duckdb-run-with-downstream",
141+
"path": "duckdb-files/run-with-downstream.db"
142+
}
143+
],
144+
"chess": [
145+
{
146+
"name": "chess-run-with-downstream",
147+
"players": [
148+
"MagnusCarlsen",
149+
"Hikaru"
150+
]
151+
}
152+
]
153+
}
154+
},
155+
"env-run-main-with-downstream": {
156+
"connections": {
157+
"generic": [
158+
{
159+
"name": "KEY1",
160+
"value": "value1"
161+
}
162+
],
163+
"duckdb": [
164+
{
165+
"name": "duckdb-run-main-with-downstream",
166+
"path": "duckdb-files/run-main-with-downstream.db"
167+
}
168+
],
169+
"chess": [
170+
{
171+
"name": "chess-run-main-with-downstream",
172+
"players": [
173+
"MagnusCarlsen",
174+
"Hikaru"
175+
]
176+
}
177+
]
178+
}
179+
},
180+
"env-push-metadata": {
181+
"connections": {
182+
"duckdb": [
183+
{
184+
"name": "duckdb-push-metadata",
185+
"path": "duckdb-files/push-metadata.db"
186+
}
187+
]
188+
}
189+
},
190+
"env-run-use-uv": {
191+
"connections": {
192+
"generic": [
193+
{
194+
"name": "KEY1",
195+
"value": "value1"
196+
}
197+
],
198+
"duckdb": [
199+
{
200+
"name": "duckdb-env-run-use-uv",
201+
"path": "duckdb-files/env-run-use-uv.db"
202+
}
203+
],
204+
"chess": [
205+
{
206+
"name": "chess-run-use-uv",
207+
"players": [
208+
"MagnusCarlsen",
209+
"Hikaru"
210+
]
211+
}
212+
]
213+
}
214+
},
215+
"env-run-malformed-sql": {
216+
"connections": {
217+
"generic": [
218+
{
219+
"name": "KEY1",
220+
"value": "value1"
221+
}
222+
],
223+
"duckdb": [
224+
{
225+
"name": "duckdb-run-malformed-sql",
226+
"path": "duckdb-files/run-malformed-sql.db"
227+
}
228+
],
229+
"chess": [
230+
{
231+
"name": "chess-run-malformed-sql",
232+
"players": [
233+
"MagnusCarlsen",
234+
"Hikaru"
235+
]
236+
}
237+
]
238+
}
54239
}
55240
}
56-
}
241+
}

0 commit comments

Comments
 (0)