From 33927366db5f476b52d431a8ae6f2767511418cd Mon Sep 17 00:00:00 2001 From: Alexander James Date: Wed, 6 Mar 2024 15:13:56 -0800 Subject: [PATCH] more test fixes --- pyleoclim/tests/test_core_MultipleResolution.py | 12 +++++++----- pyleoclim/tests/test_core_MultipleSeries.py | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pyleoclim/tests/test_core_MultipleResolution.py b/pyleoclim/tests/test_core_MultipleResolution.py index a954c51d..1c3f84b6 100644 --- a/pyleoclim/tests/test_core_MultipleResolution.py +++ b/pyleoclim/tests/test_core_MultipleResolution.py @@ -23,7 +23,7 @@ def test_plot_t0(self,ms_fixture,request): test resolution plot ''' ms = request.getfixturevalue(ms_fixture) - msr = ms.resolution() + msr = ms.resolution(statistic=None) fig,ax=msr.summary_plot() pyleo.closefig(fig) def test_plot_t1(self): @@ -34,18 +34,20 @@ def test_plot_t1(self): lr04 = pyleo.utils.load_dataset('LR04') edc = pyleo.utils.load_dataset('EDC-dD') ms = lr04.flip() & edc & co2ts # create MS object - msr = ms.resolution(time_unit='kyr BP') + msr = ms.resolution(time_unit='kyr BP',statistic=None) fig,ax=msr.summary_plot() pyleo.closefig(fig) class TestUIMultipleResolutionDescribe: - @pytest.mark.parametrize('ms_fixture', ['multipleseries_basic','multipleseries_nans']) + @pytest.mark.parametrize( + ('statistic','ms_fixture'), + (['mean','multipleseries_basic'],[None,'multipleseries_basic'],['mean','multipleseries_nans'],[None,'multipleseries_nans'])) def test_describe_t0(self,ms_fixture,request): ''' test resolution describe ''' ms = request.getfixturevalue(ms_fixture) - msr = ms.resolution() + msr = ms.resolution(statistic=None) msr.describe() def test_describe_t2(self): ''' @@ -55,5 +57,5 @@ def test_describe_t2(self): lr04 = pyleo.utils.load_dataset('LR04') edc = pyleo.utils.load_dataset('EDC-dD') ms = lr04.flip() & edc & co2ts # create MS object - msr = ms.resolution(time_unit='kyr BP') + msr = ms.resolution(time_unit='kyr BP',statistic=None) msr.describe() \ No newline at end of file diff --git a/pyleoclim/tests/test_core_MultipleSeries.py b/pyleoclim/tests/test_core_MultipleSeries.py index 339e2150..6725ff7c 100644 --- a/pyleoclim/tests/test_core_MultipleSeries.py +++ b/pyleoclim/tests/test_core_MultipleSeries.py @@ -696,7 +696,9 @@ def test_time_coverage_plot_t0(self,multipleseries_basic): pyleo.closefig(fig) class TestUIMultipleSeriesResolution: - @pytest.mark.parametrize(('statistic','ms_fixture'),(['mean',None],['multipleseries_basic','multipleseries_nans'])) + @pytest.mark.parametrize( + ('statistic','ms_fixture'), + (['mean','multipleseries_basic'],[None,'multipleseries_basic'],['mean','multipleseries_nans'],[None,'multipleseries_nans'])) def test_resolution_t0(self,statistic,ms_fixture,request): ''' test resolution class