Skip to content

Commit 95ece73

Browse files
committed
revert unit test changes that failed in remote, but fixed local
1 parent 4a8db8a commit 95ece73

File tree

3 files changed

+60
-60
lines changed

3 files changed

+60
-60
lines changed

tests/unit/labels_test.yaml

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -51,61 +51,61 @@ tests:
5151
# st2client, st2chatops
5252

5353
# each of these should be the same, but there is no test for that:
54-
# metdata.labels["app.kubernetes.io/name"]
55-
# spec.selector.matchLabels["app.kubernetes.io/name"]
56-
# spec.template.metadata.labels["app.kubernetes.io/name"]
54+
# metdata.labels.[app.kubernetes.io/name]
55+
# spec.selector.matchLabels.[app.kubernetes.io/name]
56+
# spec.template.metadata.labels.[app.kubernetes.io/name]
5757
# So, we use isNotNull instead.
5858
# see: https://github.com/quintush/helm-unittest/issues/122
5959
- isNotNull:
60-
path: metadata.labels["app.kubernetes.io/name"]
60+
path: metadata.labels.[app.kubernetes.io/name]
6161
- isNotNull:
62-
path: spec.selector.matchLabels["app.kubernetes.io/name"]
62+
path: spec.selector.matchLabels.[app.kubernetes.io/name]
6363
- isNotNull:
64-
path: spec.template.metadata.labels["app.kubernetes.io/name"]
64+
path: spec.template.metadata.labels.[app.kubernetes.io/name]
6565

6666
- equal: &metadata_labels_instance
67-
path: metadata.labels["app.kubernetes.io/instance"]
67+
path: metadata.labels.[app.kubernetes.io/instance]
6868
value: some-release-name
6969
- equal:
70-
path: spec.selector.matchLabels["app.kubernetes.io/instance"]
70+
path: spec.selector.matchLabels.[app.kubernetes.io/instance]
7171
value: some-release-name
7272
- equal: &spec_template_metadata_labels_instance
73-
path: spec.template.metadata.labels["app.kubernetes.io/instance"]
73+
path: spec.template.metadata.labels.[app.kubernetes.io/instance]
7474
value: some-release-name
7575

7676
- matchRegex: &regex_metadata_labels_component_backend_or_frontend
77-
path: metadata.labels["app.kubernetes.io/component"]
77+
path: metadata.labels.[app.kubernetes.io/component]
7878
pattern: ^(backend|frontend)$
7979
- matchRegex: &regex_spec_template_metadata_labels_component_backend_or_frontend
80-
path: spec.template.metadata.labels["app.kubernetes.io/component"]
80+
path: spec.template.metadata.labels.[app.kubernetes.io/component]
8181
pattern: ^(backend|frontend)$
8282

8383
- equal: &metadata_labels_part_of
84-
path: metadata.labels["app.kubernetes.io/part-of"]
84+
path: metadata.labels.[app.kubernetes.io/part-of]
8585
value: stackstorm
8686
- equal: &spec_template_metadata_labels_part_of
87-
path: spec.template.metadata.labels["app.kubernetes.io/part-of"]
87+
path: spec.template.metadata.labels.[app.kubernetes.io/part-of]
8888
value: stackstorm
8989

9090
- equal: &metadata_labels_app_version
91-
path: metadata.labels["app.kubernetes.io/version"]
91+
path: metadata.labels.[app.kubernetes.io/version]
9292
value: *appVersion
9393
- equal: &spec_template_metadata_labels_app_version
94-
path: spec.template.metadata.labels["app.kubernetes.io/version"]
94+
path: spec.template.metadata.labels.[app.kubernetes.io/version]
9595
value: *appVersion
9696

9797
- equal: &metadata_labels_chart
98-
path: metadata.labels["helm.sh/chart"]
98+
path: metadata.labels.[helm.sh/chart]
9999
value: stackstorm-ha-1.0.999
100100
- equal: &spec_template_metadata_labels_chart
101-
path: spec.template.metadata.labels["helm.sh/chart"]
101+
path: spec.template.metadata.labels.[helm.sh/chart]
102102
value: stackstorm-ha-1.0.999
103103

104104
- equal: &metadata_labels_managed_by
105-
path: metadata.labels["app.kubernetes.io/managed-by"]
105+
path: metadata.labels.[app.kubernetes.io/managed-by]
106106
value: Helm
107107
- equal: &spec_template_metadata_labels_managed_by
108-
path: spec.template.metadata.labels["app.kubernetes.io/managed-by"]
108+
path: spec.template.metadata.labels.[app.kubernetes.io/managed-by]
109109
value: Helm
110110

111111
- it: Jobs+Pods have requried labels
@@ -152,21 +152,21 @@ tests:
152152
# unlike deployments, jobs should not have selector.matchLabels
153153

154154
# like deployments each of these should be the same:
155-
# metdata.labels["app.kubernetes.io/name"]
156-
# spec.template.metadata.labels["app.kubernetes.io/name"]
155+
# metdata.labels.[app.kubernetes.io/name]
156+
# spec.template.metadata.labels.[app.kubernetes.io/name]
157157
- isNotNull:
158-
path: metadata.labels["app.kubernetes.io/name"]
158+
path: metadata.labels.[app.kubernetes.io/name]
159159
- isNotNull:
160-
path: spec.template.metadata.labels["app.kubernetes.io/name"]
160+
path: spec.template.metadata.labels.[app.kubernetes.io/name]
161161

162162
- equal: *metadata_labels_instance
163163
- equal: *spec_template_metadata_labels_instance
164164

165165
- matchRegex:
166-
path: metadata.labels["app.kubernetes.io/component"]
166+
path: metadata.labels.[app.kubernetes.io/component]
167167
pattern: ^(backend|tests)$
168168
- matchRegex:
169-
path: spec.template.metadata.labels["app.kubernetes.io/component"]
169+
path: spec.template.metadata.labels.[app.kubernetes.io/component]
170170
pattern: ^(backend|tests)$
171171

172172
- equal: *metadata_labels_part_of
@@ -193,7 +193,7 @@ tests:
193193
# st2auth, st2api, st2stream, st2web, st2chatops
194194

195195
- isNotNull:
196-
path: metadata.labels["app.kubernetes.io/name"]
196+
path: metadata.labels.[app.kubernetes.io/name]
197197
- equal: *metadata_labels_instance
198198
- matchRegex: *regex_metadata_labels_component_backend_or_frontend
199199
- equal: *metadata_labels_part_of
@@ -211,11 +211,11 @@ tests:
211211
- hasDocuments:
212212
count: 1
213213
- equal:
214-
path: metadata.labels["app.kubernetes.io/name"]
214+
path: metadata.labels.[app.kubernetes.io/name]
215215
value: stackstorm-ha
216216
- equal: *metadata_labels_instance
217217
- equal: &metadata_labels_component_backend
218-
path: metadata.labels["app.kubernetes.io/component"]
218+
path: metadata.labels.[app.kubernetes.io/component]
219219
value: backend
220220
- equal: *metadata_labels_part_of
221221
- equal: *metadata_labels_app_version
@@ -253,11 +253,11 @@ tests:
253253
- hasDocuments:
254254
count: 1
255255
- equal:
256-
path: metadata.labels["app.kubernetes.io/name"]
256+
path: metadata.labels.[app.kubernetes.io/name]
257257
value: ingress
258258
- equal: *metadata_labels_instance
259259
- equal:
260-
path: metadata.labels["app.kubernetes.io/component"]
260+
path: metadata.labels.[app.kubernetes.io/component]
261261
value: frontend
262262
- equal: *metadata_labels_part_of
263263
- equal: *metadata_labels_app_version
@@ -284,7 +284,7 @@ tests:
284284
- hasDocuments:
285285
count: 1
286286
- equal: &metadata_labels_app_eq_st2
287-
path: metadata.labels["app.kubernetes.io/name"]
287+
path: metadata.labels.[app.kubernetes.io/name]
288288
value: st2
289289
- equal: *metadata_labels_instance
290290
- equal: *metadata_labels_component_backend
@@ -323,7 +323,7 @@ tests:
323323
- hasDocuments:
324324
count: 1
325325
- equal:
326-
path: metadata.labels["app.kubernetes.io/name"]
326+
path: metadata.labels.[app.kubernetes.io/name]
327327
value: st2chatops
328328
- equal: *metadata_labels_instance
329329
- equal: *metadata_labels_component_backend
@@ -347,11 +347,11 @@ tests:
347347
- hasDocuments:
348348
count: 1
349349
- equal:
350-
path: metadata.labels["app.kubernetes.io/name"]
350+
path: metadata.labels.[app.kubernetes.io/name]
351351
value: st2 # should this be st2web?
352352
- equal: *metadata_labels_instance
353353
- equal:
354-
path: metadata.labels["app.kubernetes.io/component"]
354+
path: metadata.labels.[app.kubernetes.io/component]
355355
value: backend # should this be frontend?
356356
- equal: *metadata_labels_part_of
357357
- equal: *metadata_labels_app_version

tests/unit/post_start_script_test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ tests:
3232
- isAPIVersion:
3333
of: v1
3434
- isNotEmpty:
35-
path: data["post-start.sh"]
35+
path: data.[post-start.sh]
3636
- equal:
37-
path: data["post-start.sh"]
37+
path: data.[post-start.sh]
3838
value: |
3939
#!/bin/bash
4040
mkdir -p /home/yelnats/.ssh
@@ -85,9 +85,9 @@ tests:
8585
- isAPIVersion:
8686
of: v1
8787
- isNotEmpty:
88-
path: data["post-start.sh"]
88+
path: data.[post-start.sh]
8989
- matchRegex:
90-
path: data["post-start.sh"]
90+
path: data.[post-start.sh]
9191
# (?m) = multi-line mode: ^ and $ match begin/end line in addition to begin/end text
9292
# (?s) = let . match \n
9393
# .*? = any character zero or more times, prefer fewer
@@ -107,7 +107,7 @@ tests:
107107
# st2actionrunner and st2client do not have checksum annotations
108108
# (even though they probably should)
109109
- isNull: &assert_checksum
110-
path: spec.template.metadata.annotations["checksum/post-start-script"]
110+
path: spec.template.metadata.annotations.[checksum/post-start-script]
111111

112112
# only st2actionrunner and st2client have default postStart scripts
113113
- equal: &assert_lifecycle

tests/unit/st2sensors_test.yaml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ tests:
3737
documentIndex: *first_sensor_doc
3838

3939
- equal:
40-
path: metadata.labels["app.kubernetes.io/name"]
40+
path: metadata.labels.[app.kubernetes.io/name]
4141
value: st2sensorcontainer
4242
documentIndex: *first_sensor_doc
4343

4444
- equal:
45-
path: spec.template.metadata.labels["app.kubernetes.io/name"]
45+
path: spec.template.metadata.labels.[app.kubernetes.io/name]
4646
value: st2sensorcontainer
4747
documentIndex: *first_sensor_doc
4848

4949
- equal:
50-
path: spec.selector.matchLabels["app.kubernetes.io/name"]
50+
path: spec.selector.matchLabels.[app.kubernetes.io/name]
5151
value: st2sensorcontainer
5252
documentIndex: *first_sensor_doc
5353

@@ -129,41 +129,41 @@ tests:
129129
documentIndex: *third_sensor_doc
130130

131131
- equal:
132-
path: metadata.labels["app.kubernetes.io/name"]
132+
path: metadata.labels.[app.kubernetes.io/name]
133133
value: st2sensorcontainer-foo
134134
documentIndex: *first_sensor_doc
135135
- equal:
136-
path: metadata.labels["app.kubernetes.io/name"]
136+
path: metadata.labels.[app.kubernetes.io/name]
137137
value: st2sensorcontainer-bar
138138
documentIndex: *second_sensor_doc
139139
- equal:
140-
path: metadata.labels["app.kubernetes.io/name"]
140+
path: metadata.labels.[app.kubernetes.io/name]
141141
value: st2sensorcontainer-baz
142142
documentIndex: *third_sensor_doc
143143

144144
- equal:
145-
path: spec.template.metadata.labels["app.kubernetes.io/name"]
145+
path: spec.template.metadata.labels.[app.kubernetes.io/name]
146146
value: st2sensorcontainer-foo
147147
documentIndex: *first_sensor_doc
148148
- equal:
149-
path: spec.template.metadata.labels["app.kubernetes.io/name"]
149+
path: spec.template.metadata.labels.[app.kubernetes.io/name]
150150
value: st2sensorcontainer-bar
151151
documentIndex: *second_sensor_doc
152152
- equal:
153-
path: spec.template.metadata.labels["app.kubernetes.io/name"]
153+
path: spec.template.metadata.labels.[app.kubernetes.io/name]
154154
value: st2sensorcontainer-baz
155155
documentIndex: *third_sensor_doc
156156

157157
- equal:
158-
path: spec.selector.matchLabels["app.kubernetes.io/name"]
158+
path: spec.selector.matchLabels.[app.kubernetes.io/name]
159159
value: st2sensorcontainer-foo
160160
documentIndex: *first_sensor_doc
161161
- equal:
162-
path: spec.selector.matchLabels["app.kubernetes.io/name"]
162+
path: spec.selector.matchLabels.[app.kubernetes.io/name]
163163
value: st2sensorcontainer-bar
164164
documentIndex: *second_sensor_doc
165165
- equal:
166-
path: spec.selector.matchLabels["app.kubernetes.io/name"]
166+
path: spec.selector.matchLabels.[app.kubernetes.io/name]
167167
value: st2sensorcontainer-baz
168168
documentIndex: *third_sensor_doc
169169

@@ -293,41 +293,41 @@ tests:
293293
documentIndex: *third_sensor_doc
294294

295295
- equal:
296-
path: metadata.labels["app.kubernetes.io/name"]
296+
path: metadata.labels.[app.kubernetes.io/name]
297297
value: st2sensorcontainer-0
298298
documentIndex: *first_sensor_doc
299299
- equal:
300-
path: metadata.labels["app.kubernetes.io/name"]
300+
path: metadata.labels.[app.kubernetes.io/name]
301301
value: st2sensorcontainer-1
302302
documentIndex: *second_sensor_doc
303303
- equal:
304-
path: metadata.labels["app.kubernetes.io/name"]
304+
path: metadata.labels.[app.kubernetes.io/name]
305305
value: st2sensorcontainer-2
306306
documentIndex: *third_sensor_doc
307307

308308
- equal:
309-
path: spec.template.metadata.labels["app.kubernetes.io/name"]
309+
path: spec.template.metadata.labels.[app.kubernetes.io/name]
310310
value: st2sensorcontainer-0
311311
documentIndex: *first_sensor_doc
312312
- equal:
313-
path: spec.template.metadata.labels["app.kubernetes.io/name"]
313+
path: spec.template.metadata.labels.[app.kubernetes.io/name]
314314
value: st2sensorcontainer-1
315315
documentIndex: *second_sensor_doc
316316
- equal:
317-
path: spec.template.metadata.labels["app.kubernetes.io/name"]
317+
path: spec.template.metadata.labels.[app.kubernetes.io/name]
318318
value: st2sensorcontainer-2
319319
documentIndex: *third_sensor_doc
320320

321321
- equal:
322-
path: spec.selector.matchLabels["app.kubernetes.io/name"]
322+
path: spec.selector.matchLabels.[app.kubernetes.io/name]
323323
value: st2sensorcontainer-0
324324
documentIndex: *first_sensor_doc
325325
- equal:
326-
path: spec.selector.matchLabels["app.kubernetes.io/name"]
326+
path: spec.selector.matchLabels.[app.kubernetes.io/name]
327327
value: st2sensorcontainer-1
328328
documentIndex: *second_sensor_doc
329329
- equal:
330-
path: spec.selector.matchLabels["app.kubernetes.io/name"]
330+
path: spec.selector.matchLabels.[app.kubernetes.io/name]
331331
value: st2sensorcontainer-2
332332
documentIndex: *third_sensor_doc
333333

0 commit comments

Comments
 (0)