From dcde50d4ee310aed77503b13225222d5e9427808 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <dwozniak@saltstack.com>
Date: Wed, 29 Apr 2020 19:46:18 +0000
Subject: [PATCH] Fix rebase/merge wargs

---
 tests/unit/test_master.py       |  3 ---
 tests/unit/test_module_names.py | 16 +++++++++-------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tests/unit/test_master.py b/tests/unit/test_master.py
index 7d8063543ff4..4490d3690b86 100644
--- a/tests/unit/test_master.py
+++ b/tests/unit/test_master.py
@@ -42,9 +42,6 @@ def setUpClass(cls):
     def tearDownClass(cls):
         del cls.clear_funcs
 
-    def tearDown(self):
-        del self.clear_funcs
-
     def test_get_method(self):
         assert getattr(self.clear_funcs, "_send_pub", None) is not None
         assert self.clear_funcs.get_method("_send_pub") is None
diff --git a/tests/unit/test_module_names.py b/tests/unit/test_module_names.py
index 0df9ae4877da..09b8f2a01906 100644
--- a/tests/unit/test_module_names.py
+++ b/tests/unit/test_module_names.py
@@ -128,6 +128,14 @@ def test_module_name_source_match(self):
             "unit.cache.test_cache",
             "unit.serializers.test_serializers",
             "unit.states.test_postgres",
+            "unit.utils.scheduler.test_run_job",
+            "unit.utils.scheduler.test_maxrunning",
+            "unit.utils.scheduler.test_eval",
+            "unit.utils.scheduler.test_helpers",
+            "unit.utils.scheduler.test_error",
+            "unit.utils.scheduler.test_postpone",
+            "unit.utils.scheduler.test_skip",
+            "unit.utils.scheduler.test_schedule",
             "integration.cli.test_custom_module",
             "integration.cli.test_grains",
             "integration.client.test_kwarg",
@@ -163,13 +171,6 @@ def test_module_name_source_match(self):
             "integration.reactor.test_reactor",
             "integration.returners.test_noop_return",
             "integration.runners.test_runner_returns",
-            "integration.scheduler.test_error",
-            "integration.scheduler.test_eval",
-            "integration.scheduler.test_postpone",
-            "integration.scheduler.test_skip",
-            "integration.scheduler.test_maxrunning",
-            "integration.scheduler.test_helpers",
-            "integration.scheduler.test_run_job",
             "integration.setup.test_bdist",
             "integration.setup.test_egg",
             "integration.shell.test_spm",
@@ -203,6 +204,7 @@ def test_module_name_source_match(self):
             "integration.ssh.test_raw",
             "integration.ssh.test_saltcheck",
             "integration.ssh.test_state",
+            "integration.ssh.test_pre_flight",
             "integration.states.test_compiler",
             "integration.states.test_handle_error",
             "integration.states.test_handle_iorder",