From dfaef6bc957506a36fc481307807f61f98d718b3 Mon Sep 17 00:00:00 2001 From: Sangwon Lim Date: Mon, 10 Aug 2020 10:23:34 -0700 Subject: [PATCH 1/4] ignore tests that fails due to RVIC's internal issues --- setup.cfg | 1 + tests/test_wps_convolution.py | 1 + 2 files changed, 2 insertions(+) diff --git a/setup.cfg b/setup.cfg index eafa2e1..a530337 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,6 +31,7 @@ python_files = test_*.py markers = online: mark test to need internet connection slow: mark test to be slow + ignore: mark test to be ignored [flake8] max-line-length = 120 diff --git a/tests/test_wps_convolution.py b/tests/test_wps_convolution.py index 34d1ae6..d144758 100644 --- a/tests/test_wps_convolution.py +++ b/tests/test_wps_convolution.py @@ -9,6 +9,7 @@ @mark.slow @mark.online +@mark.ignore # The test will be ignored until RVIC's internal issues are resolved @mark.parametrize( ("config"), [f"{resource_filename(__name__, 'configs/convolve_opendap.cfg')}"], ) From 07b48db7b98e1502e3c228086e2369538b2ca0e1 Mon Sep 17 00:00:00 2001 From: Sangwon Lim Date: Mon, 10 Aug 2020 10:28:46 -0700 Subject: [PATCH 2/4] black applied --- tests/test_wps_convolution.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_wps_convolution.py b/tests/test_wps_convolution.py index d144758..ded932c 100644 --- a/tests/test_wps_convolution.py +++ b/tests/test_wps_convolution.py @@ -9,7 +9,7 @@ @mark.slow @mark.online -@mark.ignore # The test will be ignored until RVIC's internal issues are resolved +@mark.ignore # The test will be ignored until RVIC's internal issues are resolved @mark.parametrize( ("config"), [f"{resource_filename(__name__, 'configs/convolve_opendap.cfg')}"], ) From f5032e8c4def25ae6d13c65bcd8bd2cf8ac6bcf7 Mon Sep 17 00:00:00 2001 From: Sangwon Lim Date: Mon, 10 Aug 2020 13:23:57 -0700 Subject: [PATCH 3/4] comment out test_wps_convolution --- setup.cfg | 1 - tests/test_wps_convolution.py | 23 +++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/setup.cfg b/setup.cfg index a530337..eafa2e1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,7 +31,6 @@ python_files = test_*.py markers = online: mark test to need internet connection slow: mark test to be slow - ignore: mark test to be ignored [flake8] max-line-length = 120 diff --git a/tests/test_wps_convolution.py b/tests/test_wps_convolution.py index ded932c..f19c4b7 100644 --- a/tests/test_wps_convolution.py +++ b/tests/test_wps_convolution.py @@ -6,13 +6,16 @@ from .common import run_wps_process from osprey.processes.wps_convolution import Convolution - -@mark.slow -@mark.online -@mark.ignore # The test will be ignored until RVIC's internal issues are resolved -@mark.parametrize( - ("config"), [f"{resource_filename(__name__, 'configs/convolve_opendap.cfg')}"], -) -def test_wps_convolution(config): - params = ("config={0};").format(config) - run_wps_process(Convolution(), params) +#******************************************************************************** +# The test is disabled due to failues caused by RVIC's internal issues: +# https://github.com/UW-Hydro/RVIC/issues/96 +# https://github.com/UW-Hydro/RVIC/issues/130 +#******************************************************************************** +# @mark.slow +# @mark.online +# @mark.parametrize( +# ("config"), [f"{resource_filename(__name__, 'configs/convolve_opendap.cfg')}"], +# ) +# def test_wps_convolution(config): +# params = ("config={0};").format(config) +# run_wps_process(Convolution(), params) From ef5e7b3b403a5492a6375cf24e653346a077c23a Mon Sep 17 00:00:00 2001 From: Sangwon Lim Date: Mon, 10 Aug 2020 13:31:12 -0700 Subject: [PATCH 4/4] black applied --- tests/test_wps_convolution.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_wps_convolution.py b/tests/test_wps_convolution.py index f19c4b7..40d75cf 100644 --- a/tests/test_wps_convolution.py +++ b/tests/test_wps_convolution.py @@ -6,11 +6,11 @@ from .common import run_wps_process from osprey.processes.wps_convolution import Convolution -#******************************************************************************** +# ******************************************************************************** # The test is disabled due to failues caused by RVIC's internal issues: # https://github.com/UW-Hydro/RVIC/issues/96 # https://github.com/UW-Hydro/RVIC/issues/130 -#******************************************************************************** +# ******************************************************************************** # @mark.slow # @mark.online # @mark.parametrize(