Testing.

Author: dalthviz

Diff for: spyder/app/tests/test_mainwindow.py

@@ -205,40 +205,6 @@ def test_calltip(main_window, qtbot):
     main_window.editor.close_file()
 
 
-@pytest.mark.slow
-@flaky(max_runs=3)
-def test_change_directory_in_project_explorer(main_window, qtbot, tmpdir):
-    """Test changing a file from directory in the Project explorer."""
-    projects = main_window.projects
-
-    # Create a temp project directory
-    project_dir = str(tmpdir.mkdir('project'))
-    project_dir_tmp = osp.join(project_dir, 'tmpá')
-
-    # Create an empty file in the project dir
-    project_file = osp.join(LOCATION, 'script.py')
-    shutil.copy(project_file, osp.join(project_dir, 'script.py'))
-    os.mkdir(project_dir_tmp)
-
-    # Create project
-    with qtbot.waitSignal(projects.sig_project_loaded):
-        projects._create_project(project_dir)
-
-    # Select file in the project explorer
-    idx = projects.treewidget.get_index('script.py')
-    projects.treewidget.setCurrentIndex(idx)
-
-    # Move Python file
-    projects.treewidget.move(fnames=[osp.join(project_dir, 'script.py')],
-                             directory=project_dir_tmp)
-
-    # Assert content was moved
-    assert osp.isfile(osp.join(project_dir_tmp, 'script.py'))
-
-    # Close project
-    projects.close_project()
-
-
 @pytest.mark.slow
 @pytest.mark.single_instance
 def test_single_instance_and_edit_magic(main_window, qtbot, tmpdir):

Diff for: spyder/widgets/projects/explorer.py

@@ -261,13 +261,16 @@ def delete_project(self):
 # Tests
 #==============================================================================
 class ProjectExplorerTest(QWidget):
-    def __init__(self):
+    def __init__(self, directory=None):
         QWidget.__init__(self)
         vlayout = QVBoxLayout()
         self.setLayout(vlayout)
 
         self.explorer = ProjectExplorerWidget(None, show_all=True)
-        self.explorer.setup_project(osp.dirname(osp.abspath(__file__)))
+        if directory:
+            self.explorer.setup_project(directory)
+        else:
+            self.explorer.setup_project(osp.dirname(osp.abspath(__file__)))
         vlayout.addWidget(self.explorer)
 
         hlayout1 = QHBoxLayout()

Diff for: spyder/widgets/projects/tests/test_project_explorer.py

@@ -7,6 +7,10 @@
 """
 Tests for explorer.py
 """
+# Standard imports
+import os
+import os.path as osp
+import shutil
 
 # Test library imports
 import pytest
@@ -15,12 +19,38 @@
 from spyder.widgets.projects.explorer import ProjectExplorerTest
 
 @pytest.fixture
-def setup_projects_explorer(qtbot):
+def setup_projects_explorer(qtbot, directory=None):
     """Set up ProjectExplorerWidgetTest."""
-    project_explorer = ProjectExplorerTest()
+    project_explorer = ProjectExplorerTest(directory=directory)
     qtbot.addWidget(project_explorer)
     return project_explorer
 
+
+def test_change_directory_in_project_explorer(qtbot, tmpdir):
+    """Test changing a file from directory in the Project explorer."""
+    # Create a temp project directory
+    project_dir = str(tmpdir.mkdir('project'))
+    project_dir_tmp = osp.join(project_dir, 'tmpá')
+    project_file = osp.join(project_dir, 'script.py')
+
+    # Create an empty file in the project dir
+    os.mkdir(project_dir_tmp)
+    open(project_file, 'w').close()
+
+    # Create project
+    projects = setup_projects_explorer(qtbot, directory=project_dir)
+
+    # Move Python file
+    projects.treewidget.move(fnames=[osp.join(project_dir, 'script.py')],
+                             directory=project_dir_tmp)
+
+    # Assert content was moved
+    assert osp.isfile(osp.join(project_dir_tmp, 'script.py'))
+
+    # Close project
+    projects.close_project()
+
+
 def test_project_explorer(qtbot):
     """Run project explorer."""
     project_explorer = setup_projects_explorer(qtbot)