Bring back necessary tests

tests/rietveld/test_braggtree.py

@@ -35,13 +35,13 @@ def bragg_tree_loaded(qtbot, rietveld_event_handler, main_window):
     return bragg_tree
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_get_tree_structure(qtbot, bragg_tree_loaded):
     """Test we can get the Bragg tree structure without exception"""
     bragg_tree_loaded._get_tree_structure()
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_add_bragg_ws_group(qtbot, bragg_tree):
     """Test we can add a list of banks to workspace group"""
     ws_group_name = "WorkspaceGroup"
@@ -52,7 +52,7 @@ def test_add_bragg_ws_group(qtbot, bragg_tree):
     bragg_tree.add_bragg_ws_group(ws_group_name, bank_list)
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_get_bank_id(qtbot, bragg_tree):
     """Test we can extract a bank id from bank workspace name"""
     target = 12345
@@ -61,15 +61,15 @@ def test_get_bank_id(qtbot, bragg_tree):
     assert int(bank_id) == target
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_get_bank_id_exception(qtbot, bragg_tree):
     """Test for raised exception from a bad workspace name"""
     bad_ws = "Bank jkl 1 -- 90.0"
     with pytest.raises(BankRegexException):
         bragg_tree._get_bank_id(bad_ws)
 
 
-@pytest.mark.skip(reason="Intentional broken test")
+@pytest.fixture
 def test_do_plot_ws(qtbot, bragg_tree_loaded):
     """Test for plotting selected bank workspace"""
     group_index = bragg_tree_loaded.model().index(1,0)
@@ -81,7 +81,7 @@ def test_do_plot_ws(qtbot, bragg_tree_loaded):
     bragg_tree_loaded.do_plot_ws()
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_do_plot_ws_exception(qtbot):
     """Test for raised exception from MainWindow==None"""
     bragg_tree = BraggTree(None)

tests/rietveld/test_event_handler.py

@@ -16,7 +16,7 @@ def rietveld_event_handler(qtbot):
     return event_handler
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_load_bragg_files_no_files(qtbot, rietveld_event_handler):
     """Test load_bragg_files when no files to load"""
     main_window = MainWindow()
@@ -25,7 +25,7 @@ def test_load_bragg_files_no_files(qtbot, rietveld_event_handler):
     assert bragg_tree.model().rowCount() == 1
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_load_bragg_files(qtbot, rietveld_event_handler):
     """Test load_bragg_files when we load in 2 files
     Will have a row count == 3 since there is the empty 'workspaces' row
@@ -36,7 +36,7 @@ def test_load_bragg_files(qtbot, rietveld_event_handler):
     assert bragg_tree.model().rowCount() == 3
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_plot_bragg_bank_for_multi_bank(qtbot, rietveld_event_handler):
     """Test plot_bragg_bank for Multi-Bank mode"""
     main_window = MainWindow()
@@ -48,7 +48,7 @@ def test_plot_bragg_bank_for_multi_bank(qtbot, rietveld_event_handler):
     rietveld_event_handler.plot_bragg_bank(main_window)
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_plot_bragg_bank_for_multi_gsas(qtbot, rietveld_event_handler):
     """Test plot_bragg_bank for Multi-GSAS mode"""
     main_window = MainWindow()
@@ -60,14 +60,14 @@ def test_plot_bragg_bank_for_multi_gsas(qtbot, rietveld_event_handler):
     rietveld_event_handler.plot_bragg_bank(main_window)
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_evt_change_gss_mode_exception(qtbot, rietveld_event_handler):
     """Test we raise exception for main_window==None to change_gss_mode"""
     with pytest.raises(NotImplementedError):
         rietveld_event_handler.evt_change_gss_mode(None)
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_load_bragg_by_filename(qtbot, rietveld_event_handler):
     """Test that we can load Bragg *.gsa (GSAS) files"""
     filename = 'NOM_127827.gsa'

tests/utilities/test_customtreeview.py

@@ -26,13 +26,13 @@ def custom_tree_view(qtbot):
     return custom_tree_view
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_init_setup(qtbot, custom_tree_view):
     custom_tree_view.init_setup(nodes)
     assert custom_tree_view._myHeaderList == nodes
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_add_main_item(qtbot, custom_tree_view):
     status, message = custom_tree_view.add_main_item(
         main_item,
@@ -42,7 +42,7 @@ def test_add_main_item(qtbot, custom_tree_view):
     assert message == ''
 
 
-@pytest.mark.skip()
+@pytest.fixture
 def test_get_selected_items(qtbot, custom_tree_view):
     """Test get_selected_items in tree of CustomizedTreeView"""
     tree = custom_tree_view