Merge pull request #608 from zsloan/feature/add_rqtl_pairscan

Feature/add rqtl pairscan

2 files changed, 3 insertions, 3 deletions

diff --git a/wqflask/tests/unit/wqflask/marker_regression/test_gemma_mapping.py b/wqflask/tests/unit/wqflask/marker_regression/test_gemma_mapping.py
index 58a44b2a..f2ea22c0 100644
--- a/wqflask/tests/unit/wqflask/marker_regression/test_gemma_mapping.py
+++ b/wqflask/tests/unit/wqflask/marker_regression/test_gemma_mapping.py
@@ -114,7 +114,7 @@ class TestGemmaMapping(unittest.TestCase):
         create_trait.side_effect = create_trait_side_effect
 
         group = MockGroup({"name": "group_X", "samplelist": samplelist})
-        this_dataset = AttributeSetter({"group": group, "name": "A"})
+        this_dataset = AttributeSetter({"group": group, "name": "dataset1_name"})
         flat_files.return_value = "Home/Genenetwork"
 
         with mock.patch("builtins.open", mock.mock_open())as mock_open:
@@ -134,7 +134,7 @@ class TestGemmaMapping(unittest.TestCase):
 
             flat_files.assert_called_once_with('mapping')
             mock_open.assert_called_once_with(
-                'Home/Genenetwork/COVAR_anFZ_LfZYV0Ulywo+7tRCw.txt', 'w')
+                'Home/Genenetwork/COVAR_npKxIOnq3azWdgYixtd9IQ.txt', 'w')
             filehandler = mock_open()
             filehandler.write.assert_has_calls([mock.call(
                 '-9\t'), mock.call('-9\t'), mock.call('-9\t'), mock.call('-9\t'), mock.call('\n')])
diff --git a/wqflask/tests/unit/wqflask/marker_regression/test_rqtl_mapping.py b/wqflask/tests/unit/wqflask/marker_regression/test_rqtl_mapping.py
index 9d13e943..b4423d8f 100644
--- a/wqflask/tests/unit/wqflask/marker_regression/test_rqtl_mapping.py
+++ b/wqflask/tests/unit/wqflask/marker_regression/test_rqtl_mapping.py
@@ -32,7 +32,7 @@ class TestRqtlMapping(unittest.TestCase):
                                                     "results" : []}
 
         results = run_rqtl(trait_name="the_trait", vals=[], samples=[],
-        dataset=dataset, mapping_scale="cM", model="normal", method="hk",
+        dataset=dataset, pair_scan=False, mapping_scale="cM", model="normal", method="hk",
         num_perm=5, perm_strata_list=[], do_control="false", control_marker="",
         manhattan_plot=True, cofactors="")