From 9d8294824965c7abd43a7e9fc27f58a984f8cea7 Mon Sep 17 00:00:00 2001 From: miguelgfierro Date: Fri, 26 Jul 2019 12:23:25 +0100 Subject: [PATCH] merged with staging and added mark of azureml --- tests/ci/cpu_integration_tests_linux.yml | 4 ++-- tests/ci/gpu_integration_tests_linux.yml | 4 ++-- tests/integration/test_notebooks_sentence_similarity.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/ci/cpu_integration_tests_linux.yml b/tests/ci/cpu_integration_tests_linux.yml index 7cec15b..a815703 100644 --- a/tests/ci/cpu_integration_tests_linux.yml +++ b/tests/ci/cpu_integration_tests_linux.yml @@ -40,12 +40,12 @@ jobs: - bash: | source activate integration_cpu - pytest --durations=0 tests/smoke -m "smoke and not gpu" --junitxml=junit/test-smoke-test.xml + pytest --durations=0 tests/smoke -m "smoke and not gpu and not azureml" --junitxml=junit/test-smoke-test.xml displayName: 'Run smoke tests' - bash: | source activate integration_cpu - pytest --durations=0 tests/integration -m "integration and not gpu" --junitxml=junit/test-integration-test.xml + pytest --durations=0 tests/integration -m "integration and not gpu and not azureml" --junitxml=junit/test-integration-test.xml displayName: 'Run integration tests' - bash: | diff --git a/tests/ci/gpu_integration_tests_linux.yml b/tests/ci/gpu_integration_tests_linux.yml index 5216855..9fce9bb 100644 --- a/tests/ci/gpu_integration_tests_linux.yml +++ b/tests/ci/gpu_integration_tests_linux.yml @@ -40,12 +40,12 @@ jobs: - bash: | source activate integration_gpu - pytest --durations=0 tests/smoke -m "smoke and gpu" --junitxml=junit/test-smoke-test.xml + pytest --durations=0 tests/smoke -m "smoke and gpu and not azureml" --junitxml=junit/test-smoke-test.xml displayName: 'Run smoke tests' - bash: | source activate integration_gpu - pytest --durations=0 tests/integration -m "integration and gpu" --junitxml=junit/test-integration-test.xml + pytest --durations=0 tests/integration -m "integration and gpu and not azureml" --junitxml=junit/test-integration-test.xml displayName: 'Run integration tests' - bash: | diff --git a/tests/integration/test_notebooks_sentence_similarity.py b/tests/integration/test_notebooks_sentence_similarity.py index 78953ad..06fdaf2 100644 --- a/tests/integration/test_notebooks_sentence_similarity.py +++ b/tests/integration/test_notebooks_sentence_similarity.py @@ -46,8 +46,8 @@ def test_similarity_embeddings_baseline_runs(notebooks, baseline_results): assert results[key] == pytest.approx(value, abs=ABS_TOL) -@pytest.mark.notebooks @pytest.mark.gpu +@pytest.mark.integration def test_similarity_senteval_local_runs(notebooks, gensen_senteval_results): notebook_path = notebooks["senteval_local"] pm.execute_notebook( @@ -63,7 +63,7 @@ def test_similarity_senteval_local_runs(notebooks, gensen_senteval_results): assert out[key][task] == result -@pytest.mark.notebooks +@pytest.mark.integration @pytest.mark.azureml def test_similarity_senteval_azureml_runs(notebooks, gensen_senteval_results): notebook_path = notebooks["senteval_azureml"] @@ -87,8 +87,8 @@ def test_similarity_senteval_azureml_runs(notebooks, gensen_senteval_results): ) -@pytest.mark.notebooks @pytest.mark.gpu +@pytest.mark.integration def test_gensen_local(notebooks): notebook_path = notebooks["gensen_local"] pm.execute_notebook(