From 338ce3018d0a67ad2522ba5d96469471cee001b3 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 11 Dec 2017 14:47:30 +0100 Subject: [PATCH 1/3] these tests are sometimes slower than 200 ms on travis --- qcodes/tests/drivers/test_ami430.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qcodes/tests/drivers/test_ami430.py b/qcodes/tests/drivers/test_ami430.py index 11bdff8b79e6..892420034f90 100644 --- a/qcodes/tests/drivers/test_ami430.py +++ b/qcodes/tests/drivers/test_ami430.py @@ -199,7 +199,7 @@ def test_spherical_setpoints(current_driver, set_target): @given(set_target=random_coordinates["cylindrical"]) -@settings(max_examples=10) +@settings(max_examples=10, deadline=300) def test_cylindrical_setpoints(current_driver, set_target): """ Check that the individual x, y, z instruments are getting the set @@ -221,7 +221,7 @@ def test_cylindrical_setpoints(current_driver, set_target): @given(set_target=random_coordinates["cartesian"]) -@settings(max_examples=10) +@settings(max_examples=10, deadline=300) def test_measured(current_driver, set_target): """ Simply call the measurement methods and verify that no exceptions From be4be35207acf3cab824161ee1f48bde2f82f885 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 11 Dec 2017 14:48:37 +0100 Subject: [PATCH 2/3] Travis can be really slow on this test so increase the time --- qcodes/tests/drivers/test_tektronix_AWG70000A.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcodes/tests/drivers/test_tektronix_AWG70000A.py b/qcodes/tests/drivers/test_tektronix_AWG70000A.py index 683838088d21..2e032c388379 100644 --- a/qcodes/tests/drivers/test_tektronix_AWG70000A.py +++ b/qcodes/tests/drivers/test_tektronix_AWG70000A.py @@ -28,7 +28,7 @@ def test_init_awg2(awg2): assert idn_dict['vendor'] == 'QCoDeS' -@settings(deadline=1000, max_examples=25) +@settings(deadline=1500, max_examples=25) @given(N=hst.integers(1, 1000)) def test_SML_successful_generation_vary_length(N): From d6598c9ca74aafb46fb0d7a13c0222034d8ac100 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 11 Dec 2017 15:04:51 +0100 Subject: [PATCH 3/3] more time for this one too --- qcodes/tests/test_combined_loop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcodes/tests/test_combined_loop.py b/qcodes/tests/test_combined_loop.py index 1ed15160dce3..30bcc1c1adb8 100644 --- a/qcodes/tests/test_combined_loop.py +++ b/qcodes/tests/test_combined_loop.py @@ -102,7 +102,7 @@ def inner(): min_size=2, max_size=2, unique=True).map(sorted), z_start_stop=hst.lists(hst.integers(min_value=-800, max_value=400), min_size=2, max_size=2, unique=True).map(sorted)) - @settings(max_examples=10, deadline=300) + @settings(max_examples=10, deadline=600) def testLoopCombinedParameterAndMore(self, npoints, x_start_stop, y_start_stop, z_start_stop): x_set = np.linspace(x_start_stop[0], x_start_stop[1], npoints) y_set = np.linspace(y_start_stop[0], y_start_stop[1], npoints)