Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: re-enable failed dsl tests #26782

Merged
merged 3 commits into from
Oct 13, 2022
Merged

feat: re-enable failed dsl tests #26782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c9c58b
feat: re-enable test_dsl_pipeline_samples.py
elliotzh Oct 12, 2022
b7f15a3
feat: re-enable skipped tests in test_dsl_pipeline.py
elliotzh Oct 12, 2022
f13e9d3
feat: re-enable left skipped tests
elliotzh Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions sdk/ml/azure-ai-ml/tests/dsl/e2etests/test_dsl_pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1593,7 +1593,6 @@ def parallel_in_pipeline(job_data_path, score_model):
assert_job_input_output_types(pipeline_job)
assert pipeline_job.settings.default_compute == "cpu-cluster"

@pytest.mark.skip("https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659")
def test_parallel_components_with_file_input(self, client: MLClient) -> None:
components_dir = tests_root_dir / "test_configs/dsl_pipeline/parallel_component_with_file_input"

Expand Down Expand Up @@ -2024,7 +2023,6 @@ def pipeline(job_in_number, job_in_other_number, job_in_path):
client.jobs.get(child.name)
client.jobs.get(child.name)._repr_html_()

@pytest.mark.skip("https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659")
def test_dsl_pipeline_without_setting_binding_node(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.pipeline_with_set_binding_output_input.pipeline import (
pipeline_without_setting_binding_node,
Expand Down Expand Up @@ -2077,7 +2075,6 @@ def test_dsl_pipeline_without_setting_binding_node(self, client: MLClient) -> No
}
assert expected_job == actual_job

@pytest.mark.skip("https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659")
def test_dsl_pipeline_with_only_setting_pipeline_level(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.pipeline_with_set_binding_output_input.pipeline import (
pipeline_with_only_setting_pipeline_level,
Expand Down Expand Up @@ -2130,7 +2127,6 @@ def test_dsl_pipeline_with_only_setting_pipeline_level(self, client: MLClient) -
}
assert expected_job == actual_job

@pytest.mark.skip("https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659")
def test_dsl_pipeline_with_only_setting_binding_node(self, client: MLClient) -> None:
# Todo: checkout run priority when backend is ready
from test_configs.dsl_pipeline.pipeline_with_set_binding_output_input.pipeline import (
Expand Down Expand Up @@ -2194,7 +2190,6 @@ def test_dsl_pipeline_with_only_setting_binding_node(self, client: MLClient) ->
}
assert expected_job == actual_job

@pytest.mark.skip("https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659")
def test_dsl_pipeline_with_setting_binding_node_and_pipeline_level(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.pipeline_with_set_binding_output_input.pipeline import (
pipeline_with_setting_binding_node_and_pipeline_level,
Expand Down
45 changes: 0 additions & 45 deletions sdk/ml/azure-ai-ml/tests/dsl/e2etests/test_dsl_pipeline_samples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ def assert_dsl_curated(pipeline: PipelineJob, job_yaml, omit_fields):
@pytest.mark.e2etest
class TestDSLPipelineSamples(AzureRecordedTestCase):
@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_e2e_local_components(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.e2e_local_components.pipeline import generate_dsl_pipeline as e2e_local_components

Expand Down Expand Up @@ -113,19 +110,13 @@ def test_e2e_registered_components(
assert_dsl_curated(pipeline, job_yaml, omit_fields)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_basic_component(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.basic_component.pipeline import generate_dsl_pipeline as basic_component

pipeline = basic_component()
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_component_with_input_output(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.component_with_input_output.pipeline import (
generate_dsl_pipeline as component_with_input_output,
Expand All @@ -135,39 +126,27 @@ def test_component_with_input_output(self, client: MLClient) -> None:
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_basic_pipeline(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.basic_pipeline.pipeline import generate_dsl_pipeline as basic_pipeline

pipeline = basic_pipeline()
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_pipeline_with_data(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.pipline_with_data.pipeline import generate_dsl_pipeline as pipline_with_data

pipeline = pipline_with_data()
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_local_data_input(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.local_data_input.pipeline import generate_dsl_pipeline as local_data_input

pipeline = local_data_input()
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_datastore_datapath_uri_folder(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.datastore_datapath_uri_folder.pipeline import (
generate_dsl_pipeline as datastore_datapath_uri_folder,
Expand All @@ -177,9 +156,6 @@ def test_datastore_datapath_uri_folder(self, client: MLClient) -> None:
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_datastore_datapath_uri_file(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.datastore_datapath_uri_file.pipeline import (
generate_dsl_pipeline as datastore_datapath_uri_file,
Expand All @@ -196,9 +172,6 @@ def test_dataset_input(self, client: MLClient) -> None:
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_web_url_input(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.web_url_input.pipeline import generate_dsl_pipeline as web_url_input

Expand All @@ -220,9 +193,6 @@ def test_env_registered(self, client: MLClient) -> None:
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_env_conda_file(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.env_conda_file.pipeline import generate_dsl_pipeline as env_conda_file

Expand Down Expand Up @@ -258,9 +228,6 @@ def test_nyc_taxi_data_regression(self, client: MLClient) -> None:
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_tf_mnist(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.tf_mnist.pipeline import generate_dsl_pipeline as tf_mnist

Expand Down Expand Up @@ -295,9 +262,6 @@ def test_multi_parallel_components_with_file_input_pipeline_output(
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_parallel_components_with_tabular_input_pipeline_output(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.parallel_component_with_tabular_input.pipeline import (
generate_dsl_pipeline as pipeline_with_parallel_components,
Expand All @@ -307,29 +271,20 @@ def test_parallel_components_with_tabular_input_pipeline_output(self, client: ML
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_parallel_components(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.parallel_component.pipeline import generate_dsl_pipeline as pipeline_with_parallel_components

pipeline = pipeline_with_parallel_components()
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_automl_job_in_pipeline(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.automl_job_in_pipeline.pipeline import generate_dsl_pipeline as automl_job_in_pipeline

pipeline = automl_job_in_pipeline()
client.create_or_update(pipeline)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_pipeline_with_pipeline_component(self, client: MLClient) -> None:
from test_configs.dsl_pipeline.pipeline_with_pipeline_component.pipeline import (
generate_dsl_pipeline as pipeline_with_pipeline_component,
Expand Down
3 changes: 0 additions & 3 deletions sdk/ml/azure-ai-ml/tests/dsl/unittests/test_dsl_pipeline_samples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ def assert_dsl_curated(pipeline, job_yaml, omit_fields):
@pytest.mark.timeout(_DSL_TIMEOUT_SECOND)
@pytest.mark.unittest
class TestDSLPipelineSamples:
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_e2e_local_components(self) -> None:
from test_configs.dsl_pipeline.e2e_local_components.pipeline import generate_dsl_pipeline as e2e_local_components

Expand Down
3 changes: 0 additions & 3 deletions sdk/ml/azure-ai-ml/tests/import_job/e2etests/test_import_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ def validate_import_job_submit_cancel(self, job: ImportJob, client: MLClient) ->
assert import_job_3.status in (JobStatus.CANCEL_REQUESTED, JobStatus.CANCELED, JobStatus.FAILED)

@pytest.mark.e2etest
@pytest.mark.skip(
"https://dev.azure.com/msdata/Vienna/_workitems/edit/2009659"
)
def test_import_pipeline_submit_cancel(self, client: MLClient) -> None:

pipeline: PipelineJob = load_job("./tests/test_configs/import_job/import_pipeline_test.yml")
Expand Down
Loading