Merge branch 'features/salt-testing' of git://github.com/s0undt3ch/sa…

…lt into s0undt3ch-features/salt-testing Conflicts: .travis.yml
jraby · Jun 28, 2013 · 9a5a03f · 9a5a03f
2 parents 3f84c97 + 6e061b5
commit 9a5a03f
Show file tree

Hide file tree

Showing 83 changed files with 1,173 additions and 1,414 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ before_install:
   - pip install http://dl.dropbox.com/u/174789/m2crypto-0.20.1.tar.gz
   - pip install --use-mirrors --mirrors=http://g.pypi.python.org --mirrors=http://c.pypi.python.org --mirrors=http://pypi.crate.io coveralls
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors --mirrors=http://g.pypi.python.org --mirrors=http://c.pypi.python.org --mirrors=http://pypi.crate.io unittest2 ordereddict; fi"
+  - pip install git+https://github.com/saltstack/salt-testing.git#egg=SaltTesting
 
 install: pip install -r requirements.txt --use-mirrors --mirrors=http://g.pypi.python.org --mirrors=http://c.pypi.python.org --mirrors=http://pypi.crate.io
 

diff --git a/setup.py b/setup.py
@@ -45,7 +45,7 @@
     from distutils.core import setup
     warnings.filterwarnings(
         'ignore',
-        'Unknown distribution option: \'(install_requires|zip_safe)\'',
+        'Unknown distribution option: \'(tests_require|install_requires|zip_safe)\'',
         UserWarning,
         'distutils.dist'
     )
@@ -299,6 +299,12 @@ def run(self):
                             'salt = salt.scripts:salt_main'
                             ],
     }
+
+    # Required for running the tests suite
+    setup_kwargs['dependency_links'] = [
+        'https://github.com/saltstack/salt-testing/tarball/develop#egg=SaltTesting'
+    ]
+    setup_kwargs['tests_require'] = ['SaltTesting']
 else:
     setup_kwargs['scripts'] = ['scripts/salt-master',
                                'scripts/salt-minion',

diff --git a/tests/console.py b/tests/console.py