From 5caad172c48d7ac16430e6530dee2ec3388a30f8 Mon Sep 17 00:00:00 2001 From: Adam Stus Date: Wed, 4 Dec 2024 18:30:52 +0100 Subject: [PATCH] Fixed precommit errors and tests --- .pre-commit-config.yaml | 4 + tests/nativeapp/test_artifacts.py | 2 +- tests/snowpark/test_function.py | 714 ------------------ tests/streamlit/test_artifacts.py | 4 +- tests/streamlit/test_commands.py | 29 - .../streamlit_templated_v1/streamlit_app.py | 5 + tests/testing_utils/fixtures.py | 3 + tests_integration/conftest.py | 3 + 8 files changed, 18 insertions(+), 746 deletions(-) delete mode 100644 tests/snowpark/test_function.py diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f2fa52cfec..73d97beea8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -25,6 +25,10 @@ repos: hooks: - id: mypy additional_dependencies: [types-pkg-resources==0.1.3, types-all==1.0.0] + exclude: > + (?x) + ^tests/test_data/projects/.*| + ^tests_integration/test_data/projects/.* - repo: https://github.com/codespell-project/codespell rev: v2.2.4 hooks: diff --git a/tests/nativeapp/test_artifacts.py b/tests/nativeapp/test_artifacts.py index b098e987ce..6cec78e676 100644 --- a/tests/nativeapp/test_artifacts.py +++ b/tests/nativeapp/test_artifacts.py @@ -19,6 +19,7 @@ import pytest from click import ClickException from snowflake.cli._plugins.nativeapp.artifacts import ( + VersionInfo, build_bundle, find_events_definitions_in_manifest_file, find_version_info_in_manifest_file, @@ -29,7 +30,6 @@ NotInDeployRootError, SourceNotFoundError, TooManyFilesError, - VersionInfo, ) from snowflake.cli.api.project.definition import load_project from snowflake.cli.api.project.schemas.entities.common import PathMapping diff --git a/tests/snowpark/test_function.py b/tests/snowpark/test_function.py deleted file mode 100644 index b071277602..0000000000 --- a/tests/snowpark/test_function.py +++ /dev/null @@ -1,714 +0,0 @@ -# Copyright (c) 2024 Snowflake Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import json -from pathlib import Path -from textwrap import dedent -from unittest import mock - -import pytest -from snowflake.cli._plugins.snowpark.package_utils import ( - DownloadUnavailablePackagesResult, -) -from snowflake.cli.api.errno import DOES_NOT_EXIST_OR_NOT_AUTHORIZED -from snowflake.connector import ProgrammingError - -from tests_common import IS_WINDOWS - -if IS_WINDOWS: - pytest.skip("Requires further refactor to work on Windows", allow_module_level=True) - - -mock_session_has_warehouse = mock.patch( - "snowflake.cli.api.sql_execution.SqlExecutionMixin.session_has_warehouse", - lambda _: True, -) - - -@pytest.mark.parametrize( - "project_name", ["snowpark_functions", "snowpark_functions_v2"] -) -@mock.patch("snowflake.connector.connect") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager") -@mock_session_has_warehouse -def test_deploy_function( - mock_object_manager, - mock_connector, - mock_ctx, - runner, - project_directory, - project_name, -): - mock_object_manager.return_value.describe.side_effect = ProgrammingError( - errno=DOES_NOT_EXIST_OR_NOT_AUTHORIZED - ) - ctx = mock_ctx() - mock_connector.return_value = ctx - with project_directory(project_name) as project_dir: - result = runner.invoke( - [ - "snowpark", - "deploy", - ], - catch_exceptions=False, - ) - - assert result.exit_code == 0, result.output - assert ctx.get_queries() == [ - "create stage if not exists IDENTIFIER('MockDatabase.MockSchema.dev_deployment') comment='deployments managed by Snowflake CLI'", - f"put file://{Path(project_dir).resolve()}/app.py @MockDatabase.MockSchema.dev_deployment/my_snowpark_project/" - f" auto_compress=false parallel=4 overwrite=True", - dedent( - """\ - create or replace function IDENTIFIER('MockDatabase.MockSchema.func1')(a string default 'default value', b variant) - copy grants - returns string - language python - runtime_version=3.10 - imports=('@MockDatabase.MockSchema.dev_deployment/my_snowpark_project/app.py') - handler='app.func1_handler' - packages=() - """ - ).strip(), - ] - - -@pytest.mark.parametrize( - "project_name", - ["snowpark_function_external_access", "snowpark_function_external_access_v2"], -) -@mock.patch("snowflake.connector.connect") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager") -@mock_session_has_warehouse -def test_deploy_function_with_external_access( - mock_object_manager, - mock_connector, - mock_ctx, - runner, - project_directory, - project_name, -): - mock_object_manager.return_value.show.return_value = [ - {"name": "external_1", "type": "EXTERNAL_ACCESS"}, - {"name": "external_2", "type": "EXTERNAL_ACCESS"}, - ] - mock_object_manager.return_value.describe.side_effect = ProgrammingError( - errno=DOES_NOT_EXIST_OR_NOT_AUTHORIZED - ) - ctx = mock_ctx() - mock_connector.return_value = ctx - - with project_directory(project_name) as project_dir: - result = runner.invoke( - [ - "snowpark", - "deploy", - ], - catch_exceptions=False, - ) - - assert result.exit_code == 0, result.output - assert ctx.get_queries() == [ - "create stage if not exists IDENTIFIER('MockDatabase.MockSchema.dev_deployment') comment='deployments managed by Snowflake CLI'", - f"put file://{Path(project_dir).resolve()}/app.py @MockDatabase.MockSchema.dev_deployment/my_snowpark_project/" - f" auto_compress=false parallel=4 overwrite=True", - dedent( - """\ - create or replace function IDENTIFIER('MockDatabase.MockSchema.func1')(a string, b variant) - copy grants - returns string - language python - runtime_version=3.10 - imports=('@MockDatabase.MockSchema.dev_deployment/my_snowpark_project/app.py') - handler='app.func1_handler' - packages=() - external_access_integrations=(external_1, external_2) - secrets=('cred'=cred_name, 'other'=other_name) - """ - ).strip(), - ] - - -@pytest.mark.parametrize( - "project_name", - [ - "snowpark_function_secrets_without_external_access", - "snowpark_function_secrets_without_external_access_v2", - ], -) -@mock.patch("snowflake.connector.connect") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager") -@mock_session_has_warehouse -def test_deploy_function_secrets_without_external_access( - mock_object_manager, - mock_conn, - runner, - mock_ctx, - project_directory, - os_agnostic_snapshot, - project_name, - enable_snowpark_glob_support_feature_flag, -): - mock_object_manager.return_value.show.return_value = [ - {"name": "external_1", "type": "EXTERNAL_ACCESS"}, - {"name": "external_2", "type": "EXTERNAL_ACCESS"}, - ] - ctx = mock_ctx() - mock_conn.return_value = ctx - - with project_directory(project_name): - result = runner.invoke( - [ - "snowpark", - "build", - "--ignore-anaconda", - ], - catch_exceptions=False, - ) - assert result.exit_code == 0, result.output - result = runner.invoke( - [ - "snowpark", - "deploy", - ], - ) - - assert result.exit_code == 1, result.output - assert result.output == os_agnostic_snapshot - - -@pytest.mark.parametrize( - "project_name", ["snowpark_functions", "snowpark_functions_v2"] -) -@mock.patch("snowflake.connector.connect") -@mock.patch( - "snowflake.cli._plugins.snowpark.package_utils.download_unavailable_packages" -) -@mock_session_has_warehouse -def test_deploy_function_no_changes( - mock_download, - mock_connector, - runner, - mock_ctx, - mock_cursor, - project_directory, - project_name, - enable_snowpark_glob_support_feature_flag, -): - mock_download.return_value = DownloadUnavailablePackagesResult() - rows = [ - ("packages", '["foo==1.2.3", "bar>=3.0.0"]'), - ("handler", "app.func1_handler"), - ("returns", "string"), - ("imports", "dev_deployment/my_snowpark_project/app.py"), - ("runtime_version", "3.10"), - ] - - queries, result, project_dir = _deploy_function( - rows, - mock_connector, - runner, - mock_ctx, - mock_cursor, - project_directory, - project_name, - "--replace", - ) - - assert result.exit_code == 0, result.output - assert json.loads(result.output) == [ - { - "object": "MockDatabase.MockSchema.func1(a string default 'default value', b variant)", - "status": "packages updated", - "type": "function", - } - ] - assert queries == [ - "create stage if not exists IDENTIFIER('MockDatabase.MockSchema.dev_deployment') comment='deployments managed by Snowflake CLI'", - f"put file://{Path(project_dir).resolve()}/output/my_snowpark_project/app.py @MockDatabase.MockSchema.dev_deployment/my_snowpark_project/ auto_compress=false parallel=4 overwrite=True", - ] - - -@pytest.mark.parametrize( - "project_name", ["snowpark_functions", "snowpark_functions_v2"] -) -@mock.patch("snowflake.connector.connect") -@mock.patch( - "snowflake.cli._plugins.snowpark.package_utils.download_unavailable_packages" -) -@mock_session_has_warehouse -def test_deploy_function_needs_update_because_packages_changes( - mock_download, - mock_connector, - runner, - mock_ctx, - mock_cursor, - project_directory, - project_name, - enable_snowpark_glob_support_feature_flag, -): - mock_download.return_value = DownloadUnavailablePackagesResult() - rows = [ - ("packages", '["foo==1.2.3"]'), - ("handler", "main.py:app"), - ("returns", "table(variant)"), - ] - - queries, result, project_dir = _deploy_function( - rows, - mock_connector, - runner, - mock_ctx, - mock_cursor, - project_directory, - project_name, - "--replace", - ) - - assert result.exit_code == 0, result.output - assert json.loads(result.output) == [ - { - "object": "MockDatabase.MockSchema.func1(a string default 'default value', b variant)", - "status": "definition updated", - "type": "function", - } - ] - assert queries == [ - "create stage if not exists IDENTIFIER('MockDatabase.MockSchema.dev_deployment') comment='deployments managed by Snowflake CLI'", - f"put file://{Path(project_dir).resolve()}/output/my_snowpark_project/app.py @MockDatabase.MockSchema.dev_deployment/my_snowpark_project/ auto_compress=false parallel=4 overwrite=True", - dedent( - """\ - create or replace function IDENTIFIER('MockDatabase.MockSchema.func1')(a string default 'default value', b variant) - copy grants - returns string - language python - runtime_version=3.10 - imports=('@MockDatabase.MockSchema.dev_deployment/my_snowpark_project/app.py') - handler='app.func1_handler' - packages=('foo==1.2.3','bar>=3.0.0') - """ - ).strip(), - ] - - -@pytest.mark.parametrize( - "project_name", ["snowpark_functions", "snowpark_functions_v2"] -) -@mock.patch("snowflake.connector.connect") -@mock.patch( - "snowflake.cli._plugins.snowpark.package_utils.download_unavailable_packages" -) -@mock_session_has_warehouse -def test_deploy_function_needs_update_because_handler_changes( - mock_download, - mock_connector, - runner, - mock_ctx, - mock_cursor, - project_directory, - project_name, - enable_snowpark_glob_support_feature_flag, -): - mock_download.return_value = DownloadUnavailablePackagesResult() - rows = [ - ("packages", '["foo==1.2.3", "bar>=3.0.0"]'), - ("handler", "main.py:oldApp"), - ("returns", "table(variant)"), - ] - - queries, result, project_dir = _deploy_function( - rows, - mock_connector, - runner, - mock_ctx, - mock_cursor, - project_directory, - project_name, - "--replace", - ) - - assert result.exit_code == 0, result.output - assert json.loads(result.output) == [ - { - "object": "MockDatabase.MockSchema.func1(a string default 'default value', b variant)", - "status": "definition updated", - "type": "function", - } - ] - assert queries == [ - "create stage if not exists IDENTIFIER('MockDatabase.MockSchema.dev_deployment') comment='deployments managed by Snowflake CLI'", - f"put file://{Path(project_dir).resolve()}/output/my_snowpark_project/app.py @MockDatabase.MockSchema.dev_deployment/my_snowpark_project/" - f" auto_compress=false parallel=4 overwrite=True", - dedent( - """\ - create or replace function IDENTIFIER('MockDatabase.MockSchema.func1')(a string default 'default value', b variant) - copy grants - returns string - language python - runtime_version=3.10 - imports=('@MockDatabase.MockSchema.dev_deployment/my_snowpark_project/app.py') - handler='app.func1_handler' - packages=('foo==1.2.3','bar>=3.0.0') - """ - ).strip(), - ] - - -@pytest.mark.parametrize( - "project_name", - [ - "snowpark_function_fully_qualified_name", - "snowpark_function_fully_qualified_name_v2", - ], -) -@mock.patch("snowflake.connector.connect") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager.describe") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager.show") -@mock.patch( - "snowflake.cli._plugins.snowpark.package_utils.download_unavailable_packages" -) -@mock_session_has_warehouse -def test_deploy_function_fully_qualified_name_duplicated_database( - mock_download, - mock_om_show, - mock_om_describe, - mock_conn, - runner, - mock_ctx, - project_directory, - alter_snowflake_yml, - os_agnostic_snapshot, - project_name, - enable_snowpark_glob_support_feature_flag, -): - mock_download.return_value = DownloadUnavailablePackagesResult() - number_of_functions_in_project = 6 - mock_om_describe.side_effect = [ - ProgrammingError(errno=DOES_NOT_EXIST_OR_NOT_AUTHORIZED), - ] * number_of_functions_in_project - ctx = mock_ctx() - mock_conn.return_value = ctx - - with project_directory(project_name): - result = runner.invoke( - [ - "snowpark", - "build", - "--ignore-anaconda", - ], - catch_exceptions=False, - ) - assert result.exit_code == 0, result.output - result = runner.invoke(["snowpark", "deploy"]) - assert result.output == os_agnostic_snapshot(name="database error") - - -@pytest.mark.parametrize( - "project_name,path_in_project_file", - [ - ("snowpark_function_fully_qualified_name", "snowpark.functions.5.name"), - ( - "snowpark_function_fully_qualified_name_v2", - "entities.custom_database_custom_schema_fqn_function_error.identifier.name", - ), - ], -) -@mock.patch("snowflake.connector.connect") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager.describe") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager.show") -@mock.patch( - "snowflake.cli._plugins.snowpark.package_utils.download_unavailable_packages" -) -@mock_session_has_warehouse -def test_deploy_function_fully_qualified_name_duplicated_schema( - mock_download, - mock_om_show, - mock_om_describe, - mock_conn, - runner, - mock_ctx, - project_directory, - alter_snowflake_yml, - os_agnostic_snapshot, - project_name, - path_in_project_file, - enable_snowpark_glob_support_feature_flag, -): - mock_download.return_value = DownloadUnavailablePackagesResult() - number_of_functions_in_project = 6 - mock_om_describe.side_effect = [ - ProgrammingError(errno=DOES_NOT_EXIST_OR_NOT_AUTHORIZED), - ] * number_of_functions_in_project - ctx = mock_ctx() - mock_conn.return_value = ctx - - with project_directory(project_name) as tmp_dir: - alter_snowflake_yml( - tmp_dir / "snowflake.yml", - parameter_path=path_in_project_file, - value="custom_schema.fqn_function_error", - ) - result = runner.invoke( - [ - "snowpark", - "build", - "--ignore-anaconda", - ], - catch_exceptions=False, - ) - assert result.exit_code == 0, result.output - result = runner.invoke(["snowpark", "deploy"]) - assert result.output == os_agnostic_snapshot(name="schema error") - - -@pytest.mark.parametrize( - "project_name,parameter_path", - [ - ("snowpark_function_fully_qualified_name", "snowpark.functions.5.name"), - ( - "snowpark_function_fully_qualified_name_v2", - "entities.custom_database_custom_schema_fqn_function_error.identifier.name", - ), - ], -) -@mock.patch("snowflake.connector.connect") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager.describe") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager.show") -@mock.patch( - "snowflake.cli._plugins.snowpark.package_utils.download_unavailable_packages" -) -@mock_session_has_warehouse -def test_deploy_function_fully_qualified_name( - mock_download, - mock_om_show, - mock_om_describe, - mock_conn, - runner, - mock_ctx, - project_directory, - alter_snowflake_yml, - os_agnostic_snapshot, - project_name, - parameter_path, - enable_snowpark_glob_support_feature_flag, -): - mock_download.return_value = DownloadUnavailablePackagesResult() - number_of_functions_in_project = 6 - mock_om_describe.side_effect = [ - ProgrammingError(errno=DOES_NOT_EXIST_OR_NOT_AUTHORIZED), - ] * number_of_functions_in_project - ctx = mock_ctx() - mock_conn.return_value = ctx - - with project_directory(project_name) as tmp_dir: - alter_snowflake_yml( - tmp_dir / "snowflake.yml", - parameter_path=parameter_path, - value="fqn_function3", - ) - result = runner.invoke( - [ - "snowpark", - "build", - "--ignore-anaconda", - ], - catch_exceptions=False, - ) - assert result.exit_code == 0, result.output - result = runner.invoke(["snowpark", "deploy"]) - assert result.exit_code == 0 - assert result.output == os_agnostic_snapshot(name="ok") - - -@pytest.mark.parametrize( - "project_name,signature_path,runtime_path", - [ - ( - "snowpark_functions", - "snowpark.functions.0.signature.0.", - "snowpark.functions.0.runtime", - ), - ( - "snowpark_functions_v2", - "entities.func1.signature.0.", - "entities.func1.runtime", - ), - ], -) -@pytest.mark.parametrize( - "parameter_type,default_value", - [ - ("string", None), - ("string", ""), - ("int", None), - ("variant", None), - ("bool", None), - ], -) -@mock.patch("snowflake.connector.connect") -@mock.patch("snowflake.cli._plugins.snowpark.commands.ObjectManager") -@mock.patch( - "snowflake.cli._plugins.snowpark.package_utils.download_unavailable_packages" -) -@mock_session_has_warehouse -def test_deploy_function_with_empty_default_value( - mock_download, - mock_object_manager, - mock_connector, - mock_ctx, - runner, - project_directory, - alter_snowflake_yml, - parameter_type, - default_value, - project_name, - signature_path, - runtime_path, - enable_snowpark_glob_support_feature_flag, -): - mock_download.return_value = DownloadUnavailablePackagesResult() - mock_object_manager.return_value.describe.side_effect = ProgrammingError( - errno=DOES_NOT_EXIST_OR_NOT_AUTHORIZED - ) - ctx = mock_ctx() - mock_connector.return_value = ctx - with project_directory(project_name) as project_dir: - snowflake_yml = project_dir / "snowflake.yml" - for param, value in [("type", parameter_type), ("default", default_value)]: - alter_snowflake_yml( - snowflake_yml, - parameter_path=f"{signature_path}{param}", - value=value, - ) - alter_snowflake_yml( - snowflake_yml, - parameter_path=runtime_path, - value="3.10", - ) - result = runner.invoke( - [ - "snowpark", - "build", - "--ignore-anaconda", - ], - catch_exceptions=False, - ) - assert result.exit_code == 0, result.output - result = runner.invoke( - ["snowpark", "deploy", "--format", "json"], catch_exceptions=False - ) - default_value_json = default_value - if default_value is None: - default_value_json = "null" - elif parameter_type == "string": - default_value_json = f"'{default_value}'" - - assert result.exit_code == 0, result.output - assert json.loads(result.output) == [ - { - "object": f"MockDatabase.MockSchema.func1(a {parameter_type} default {default_value_json}, b variant)", - "status": "created", - "type": "function", - } - ] - - -@mock.patch("snowflake.connector.connect") -def test_execute_function(mock_connector, runner, mock_ctx): - ctx = mock_ctx() - mock_connector.return_value = ctx - result = runner.invoke( - [ - "snowpark", - "execute", - "function", - "functionName(42, 'string')", - ] - ) - - assert result.exit_code == 0, result.output - assert ctx.get_query() == "select functionName(42, 'string')" - - -def _deploy_function( - rows, - mock_connector, - runner, - mock_ctx, - mock_cursor, - project_directory, - project_name, - *args, -): - ctx = mock_ctx(mock_cursor(rows=rows, columns=[])) - mock_connector.return_value = ctx - with ( - mock.patch( - "snowflake.cli._plugins.snowpark.commands.ObjectManager.describe" - ) as om_describe, - mock.patch( - "snowflake.cli._plugins.snowpark.commands.ObjectManager.show" - ) as om_show, - ): - om_describe.return_value = rows - - with project_directory(project_name) as temp_dir: - (Path(temp_dir) / "requirements.snowflake.txt").write_text( - "foo==1.2.3\nbar>=3.0.0" - ) - result = runner.invoke( - [ - "snowpark", - "build", - "--ignore-anaconda", - ], - catch_exceptions=False, - ) - assert result.exit_code == 0, result.output - result = runner.invoke( - [ - "snowpark", - "deploy", - "--format", - "json", - *args, - ] - ) - queries = ctx.get_queries() - return queries, result, temp_dir - - -@mock.patch("snowflake.connector.connect") -@pytest.mark.parametrize( - "command, parameters", - [ - ("list", []), - ("list", ["--like", "PATTERN"]), - ("describe", ["NAME"]), - ("drop", ["NAME"]), - ], -) -def test_command_aliases(mock_connector, runner, mock_ctx, command, parameters): - ctx = mock_ctx() - mock_connector.return_value = ctx - - result = runner.invoke(["object", command, "function", *parameters]) - assert result.exit_code == 0, result.output - result = runner.invoke( - ["snowpark", command, "function", *parameters], catch_exceptions=False - ) - assert result.exit_code == 0, result.output - - queries = ctx.get_queries() - assert queries[0] == queries[1] diff --git a/tests/streamlit/test_artifacts.py b/tests/streamlit/test_artifacts.py index 4b75406d1c..d63f3033df 100644 --- a/tests/streamlit/test_artifacts.py +++ b/tests/streamlit/test_artifacts.py @@ -112,7 +112,7 @@ @mock.patch("snowflake.cli._plugins.snowpark.commands.StageManager.put") @mock.patch( "snowflake.cli._plugins.connection.util.get_ui_parameters", - return_value={UIParameter.NA_ENABLE_REGIONLESS_REDIRECT: "false"}, + return_value={UIParameter.NA_ENABLE_REGIONLESS_REDIRECT: False}, ) def test_deploy_with_artifacts( mock_param, @@ -252,7 +252,7 @@ def test_deploy_with_artifacts( @mock.patch("snowflake.cli._plugins.snowpark.commands.StageManager.put") @mock.patch( "snowflake.cli._plugins.connection.util.get_ui_parameters", - return_value={UIParameter.NA_ENABLE_REGIONLESS_REDIRECT: "false"}, + return_value={UIParameter.NA_ENABLE_REGIONLESS_REDIRECT: False}, ) def test_deploy_with_artifacts_from_other_directory( mock_param, diff --git a/tests/streamlit/test_commands.py b/tests/streamlit/test_commands.py index cd39056335..9a859ad030 100644 --- a/tests/streamlit/test_commands.py +++ b/tests/streamlit/test_commands.py @@ -920,35 +920,6 @@ def test_deploy_streamlit_main_and_pages_files_experimental_replace( ] -@pytest.mark.parametrize( - "project_name,opts", - [ - ("example_streamlit", {"streamlit": {"pages_dir": "foo.bar"}}), - ("example_streamlit", {"streamlit": {"env_file": "foo.bar"}}), - ( - "example_streamlit_v2", - {"entities": {"test_streamlit": {"pages_dir": "foo.bar"}}}, - ), - ( - "example_streamlit_v2", - {"entities": {"test_streamlit": {"artifacts": ["foo.bar"]}}}, - ), - ], -) -@mock.patch("snowflake.connector.connect") -def test_deploy_streamlit_nonexisting_file( - mock_connector, runner, mock_ctx, snapshot, project_directory, opts, project_name -): - ctx = mock_ctx() - mock_connector.return_value = ctx - - with project_directory(project_name, merge_project_definition=opts): - result = runner.invoke(["streamlit", "deploy"]) - - assert result.exit_code == 1 - assert result.output == snapshot - - @mock.patch("snowflake.connector.connect") def test_share_streamlit(mock_connector, runner, mock_ctx): ctx = mock_ctx() diff --git a/tests/test_data/projects/streamlit_templated_v1/streamlit_app.py b/tests/test_data/projects/streamlit_templated_v1/streamlit_app.py index e69de29bb2..1a8695c60d 100644 --- a/tests/test_data/projects/streamlit_templated_v1/streamlit_app.py +++ b/tests/test_data/projects/streamlit_templated_v1/streamlit_app.py @@ -0,0 +1,5 @@ +from common.hello import say_hello + +import streamlit as st + +st.title(f"Example streamlit app. {say_hello()}") diff --git a/tests/testing_utils/fixtures.py b/tests/testing_utils/fixtures.py index 457acec1c6..192776fcc9 100644 --- a/tests/testing_utils/fixtures.py +++ b/tests/testing_utils/fixtures.py @@ -473,5 +473,8 @@ def enable_snowpark_glob_support_feature_flag(): with mock.patch( f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled", return_value=True, + ), mock.patch( + f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_disabled", + return_value=False, ): yield diff --git a/tests_integration/conftest.py b/tests_integration/conftest.py index 6be62f1ce5..1ac9bda801 100644 --- a/tests_integration/conftest.py +++ b/tests_integration/conftest.py @@ -266,5 +266,8 @@ def enable_snowpark_glob_support_feature_flag(): with mock.patch( f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_enabled", return_value=True, + ), mock.patch( + f"snowflake.cli.api.feature_flags.FeatureFlag.ENABLE_SNOWPARK_GLOB_SUPPORT.is_disabled", + return_value=False, ): yield