From 21cebcc0913c9308f0e3a0d09801b144adc7ff7f Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Sun, 12 Feb 2012 16:10:50 -0700
Subject: [PATCH] run all modules in the modules dir

---
 tests/modules/__init__.py | 13 -------------
 tests/runtests.py         |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 tests/modules/__init__.py

diff --git a/tests/modules/__init__.py b/tests/modules/__init__.py
deleted file mode 100644
index 703b2743b5..0000000000
--- a/tests/modules/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from salt.cli.caller import Caller
-from salt.config import minion_config
-
-defaults = {
-    'module_dirs': '',
-    'log_level': 'warning',
-}
-config = minion_config('/etc/salt/minion')
-
-def run_module(name, *args):
-    opts = defaults.copy()
-    opts.update(config, fun=name, arg=args)
-    return Caller(opts).call()
diff --git a/tests/runtests.py b/tests/runtests.py
index cc139a99e9..deea087522 100644
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -12,7 +12,7 @@ TEST_DIR = os.path.dirname(os.path.normpath(os.path.abspath(__file__)))
 def main():
     saltunittest.TestDaemon()
     loader = saltunittest.TestLoader()
-    tests = loader.discover(os.path.join(TEST_DIR, 'modules'))
+    tests = loader.discover(os.path.join(TEST_DIR, 'modules'), '*.py')
     saltunittest.TextTestRunner(verbosity=1).run(tests)