|
12 | 12 | # See the License for the specific language governing permissions and |
13 | 13 | # limitations under the License. |
14 | 14 | from shlex import split |
15 | | -from typing import Dict, Callable |
| 15 | +from typing import Callable, Dict, List |
16 | 16 | from unittest import mock |
17 | 17 |
|
18 | 18 | from snowflake.cli._app.telemetry import TelemetryEvent, CLITelemetryField |
@@ -111,13 +111,12 @@ def test_feature_counters_v1_post_deploy_set_and_package_scripts_available( |
111 | 111 | mock_telemetry, TelemetryEvent.CMD_EXECUTION_RESULT.value |
112 | 112 | ) |
113 | 113 |
|
114 | | - assert message[CLITelemetryField.COUNTERS.value] == { |
115 | | - CLICounterField.SNOWPARK_PROCESSOR: 0, |
116 | | - CLICounterField.TEMPLATES_PROCESSOR: 0, |
117 | | - CLICounterField.PDF_TEMPLATES: 0, |
118 | | - CLICounterField.POST_DEPLOY_SCRIPTS: 1, |
119 | | - CLICounterField.PACKAGE_SCRIPTS: 0, |
120 | | - } |
| 114 | + counters = message[CLITelemetryField.COUNTERS.value] |
| 115 | + assert counters[CLICounterField.SNOWPARK_PROCESSOR] == 0 |
| 116 | + assert counters[CLICounterField.TEMPLATES_PROCESSOR] == 0 |
| 117 | + assert counters[CLICounterField.PDF_TEMPLATES] == 0 |
| 118 | + assert counters[CLICounterField.POST_DEPLOY_SCRIPTS] == 1 |
| 119 | + assert counters[CLICounterField.PACKAGE_SCRIPTS] == 0 |
121 | 120 |
|
122 | 121 |
|
123 | 122 | @pytest.mark.integration |
@@ -161,11 +160,10 @@ def test_feature_counters_v2_post_deploy_not_available_in_bundle( |
161 | 160 | mock_telemetry, TelemetryEvent.CMD_EXECUTION_RESULT.value |
162 | 161 | ) |
163 | 162 |
|
164 | | - assert message[CLITelemetryField.COUNTERS.value] == { |
165 | | - CLICounterField.SNOWPARK_PROCESSOR: 0, |
166 | | - CLICounterField.TEMPLATES_PROCESSOR: 0, |
167 | | - CLICounterField.PDF_TEMPLATES: 1, |
168 | | - } |
| 163 | + counters = message[CLITelemetryField.COUNTERS.value] |
| 164 | + assert counters[CLICounterField.SNOWPARK_PROCESSOR] == 0 |
| 165 | + assert counters[CLICounterField.TEMPLATES_PROCESSOR] == 0 |
| 166 | + assert counters[CLICounterField.PDF_TEMPLATES] == 1 |
169 | 167 |
|
170 | 168 |
|
171 | 169 | @pytest.mark.integration |
@@ -207,15 +205,14 @@ def test_feature_counter_v2_templates_processor_set( |
207 | 205 | mock_telemetry, TelemetryEvent.CMD_EXECUTION_RESULT.value |
208 | 206 | ) |
209 | 207 |
|
210 | | - assert message[CLITelemetryField.COUNTERS.value] == { |
211 | | - CLICounterField.SNOWPARK_PROCESSOR: 0, |
212 | | - CLICounterField.TEMPLATES_PROCESSOR: 1, |
213 | | - CLICounterField.PDF_TEMPLATES: 0, |
214 | | - CLICounterField.POST_DEPLOY_SCRIPTS: 0, |
215 | | - CLICounterField.EVENT_SHARING: 0, |
216 | | - CLICounterField.EVENT_SHARING_ERROR: 0, |
217 | | - CLICounterField.EVENT_SHARING_WARNING: 0, |
218 | | - } |
| 208 | + counters = message[CLITelemetryField.COUNTERS.value] |
| 209 | + assert counters[CLICounterField.SNOWPARK_PROCESSOR] == 0 |
| 210 | + assert counters[CLICounterField.TEMPLATES_PROCESSOR] == 1 |
| 211 | + assert counters[CLICounterField.PDF_TEMPLATES] == 0 |
| 212 | + assert counters[CLICounterField.POST_DEPLOY_SCRIPTS] == 0 |
| 213 | + assert counters[CLICounterField.EVENT_SHARING] == 0 |
| 214 | + assert counters[CLICounterField.EVENT_SHARING_ERROR] == 0 |
| 215 | + assert counters[CLICounterField.EVENT_SHARING_WARNING] == 0 |
219 | 216 |
|
220 | 217 |
|
221 | 218 | @pytest.mark.integration |
@@ -244,13 +241,12 @@ def test_feature_counter_v1_package_scripts_converted_to_post_deploy_and_both_se |
244 | 241 | mock_telemetry, TelemetryEvent.CMD_EXECUTION_RESULT.value |
245 | 242 | ) |
246 | 243 |
|
247 | | - assert message[CLITelemetryField.COUNTERS.value] == { |
248 | | - CLICounterField.SNOWPARK_PROCESSOR: 0, |
249 | | - CLICounterField.TEMPLATES_PROCESSOR: 0, |
250 | | - CLICounterField.PDF_TEMPLATES: 0, |
251 | | - CLICounterField.POST_DEPLOY_SCRIPTS: 1, |
252 | | - CLICounterField.PACKAGE_SCRIPTS: 1, |
253 | | - } |
| 244 | + counters = message[CLITelemetryField.COUNTERS.value] |
| 245 | + assert counters[CLICounterField.SNOWPARK_PROCESSOR] == 0 |
| 246 | + assert counters[CLICounterField.TEMPLATES_PROCESSOR] == 0 |
| 247 | + assert counters[CLICounterField.PDF_TEMPLATES] == 0 |
| 248 | + assert counters[CLICounterField.POST_DEPLOY_SCRIPTS] == 1 |
| 249 | + assert counters[CLICounterField.PACKAGE_SCRIPTS] == 1 |
254 | 250 |
|
255 | 251 |
|
256 | 252 | @pytest.mark.integration |
@@ -289,12 +285,11 @@ def test_feature_counter_v2_post_deploy_set_and_package_scripts_not_available( |
289 | 285 | mock_telemetry, TelemetryEvent.CMD_EXECUTION_RESULT.value |
290 | 286 | ) |
291 | 287 |
|
292 | | - assert message[CLITelemetryField.COUNTERS.value] == { |
293 | | - CLICounterField.SNOWPARK_PROCESSOR: 0, |
294 | | - CLICounterField.TEMPLATES_PROCESSOR: 0, |
295 | | - CLICounterField.PDF_TEMPLATES: 1, |
296 | | - CLICounterField.POST_DEPLOY_SCRIPTS: 1, |
297 | | - } |
| 288 | + counters = message[CLITelemetryField.COUNTERS.value] |
| 289 | + assert counters[CLICounterField.SNOWPARK_PROCESSOR] == 0 |
| 290 | + assert counters[CLICounterField.TEMPLATES_PROCESSOR] == 0 |
| 291 | + assert counters[CLICounterField.PDF_TEMPLATES] == 1 |
| 292 | + assert counters[CLICounterField.POST_DEPLOY_SCRIPTS] == 1 |
298 | 293 |
|
299 | 294 |
|
300 | 295 | @pytest.mark.integration |
|
0 commit comments