File spyder-pr12746-fixtests.patch of Package spyder

Overview Repositories Revisions Requests Users Attributes Meta

File spyder-pr12746-fixtests.patch of Package spyder (Revision dc22bf6b9a6a32941e745a2c0239c79a)

Currently displaying revision dc22bf6b9a6a32941e745a2c0239c79a , Show latest

From 86b512a94db4a6436b714516a9416d3263cd76b9 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Thu, 14 May 2020 12:12:11 -0500
Subject: [PATCH 1/3] Testing: Skip test_automatic_column_width on Python 2 and
 Linux

It started to fail sometimes lately.
---
 .../widgets/tests/test_namespacebrowser.py                | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spyder/plugins/variableexplorer/widgets/tests/test_namespacebrowser.py b/spyder/plugins/variableexplorer/widgets/tests/test_namespacebrowser.py
index b66c6fdf07..4e2b345a3c 100644
--- a/spyder/plugins/variableexplorer/widgets/tests/test_namespacebrowser.py
+++ b/spyder/plugins/variableexplorer/widgets/tests/test_namespacebrowser.py
@@ -14,12 +14,15 @@
     from mock import Mock # Python 2
 
 # Third party imports
+from flaky import flaky
 import pytest
 from qtpy.QtCore import Qt, QPoint
 
 # Local imports
 from spyder.plugins.variableexplorer.widgets.namespacebrowser import NamespaceBrowser
 from spyder.plugins.variableexplorer.widgets.tests.test_collectioneditor import data_table
+from spyder.py3compat import PY2
+
 
 def test_setup_sets_dataframe_format(qtbot):
     browser = NamespaceBrowser(None)
@@ -31,6 +34,11 @@ def test_setup_sets_dataframe_format(qtbot):
     assert browser.editor.source_model.dataframe_format == '%10.5f'
 
 
+@flaky(max_runs=5)
+@pytest.mark.skipif(
+    sys.platform.startswith('linux') and PY2,
+    reason="Sometimes fails on Linux and Python 2"
+)
 def test_automatic_column_width(qtbot):
     browser = NamespaceBrowser(None)
     browser.set_shellwidget(Mock())

From 07fab8041d63443a6a0b916619c27b9860582bb8 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Thu, 14 May 2020 12:15:57 -0500
Subject: [PATCH 2/3] Calltip: Add default value for _start_position

This should avoid an error during the teardown of a test on macOS and
Python 3.
---
 spyder/widgets/calltip.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spyder/widgets/calltip.py b/spyder/widgets/calltip.py
index 33d93d045a..0db4d632da 100644
--- a/spyder/widgets/calltip.py
+++ b/spyder/widgets/calltip.py
@@ -264,6 +264,7 @@ def __init__(self, text_edit, hide_timer_on=False, as_tooltip=False):
         self.tip = None
         self._hide_timer = QBasicTimer()
         self._text_edit = text_edit
+        self._start_position = -1
 
         # Setup
         if sys.platform == 'darwin':

From 723bf57042082121d9a4002f3f76ab30b6647a82 Mon Sep 17 00:00:00 2001
From: Carlos Cordoba <ccordoba12@gmail.com>
Date: Thu, 14 May 2020 12:23:38 -0500
Subject: [PATCH 3/3] Testing: Add missing import

---
 .../variableexplorer/widgets/tests/test_namespacebrowser.py      | 1 +
 1 file changed, 1 insertion(+)

Places

File spyder-pr12746-fixtests.patch of Package spyder (Revision dc22bf6b9a6a32941e745a2c0239c79a)

Places