Permalink
Browse files

Fix running tests using `python setup.py tests`. I was deleting it to…

…o soon and not re-creating it. Increase tests verbosity on travis-ci.
  • Loading branch information...
1 parent c976e42 commit 85c66645382dea7de5320672ebb100855d6d8d12 @s0undt3ch s0undt3ch committed Oct 5, 2012
Showing with 2 additions and 4 deletions.
  1. +1 −1 .travis.yml
  2. +1 −3 tests/integration/__init__.py
View
2 .travis.yml
@@ -14,7 +14,7 @@ before_install:
- "if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi"
install: pip install -r requirements.txt --use-mirrors
-script: sudo -E python setup.py test --runtests-opts='--run-destructive'
+script: sudo -E python setup.py test --runtests-opts='--run-destructive -v'
notifications:
irc:
View
4 tests/integration/__init__.py
@@ -33,9 +33,6 @@
PYEXEC = 'python{0}.{1}'.format(sys.version_info[0], sys.version_info[1])
TMP = os.path.join(tempfile.gettempdir(), 'salt-tests-tmpdir')
-if not os.path.isdir(TMP):
- os.makedirs(TMP)
-
FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
MOCKBIN = os.path.join(INTEGRATION_TEST_DIR, 'mockbin')
@@ -151,6 +148,7 @@ def __enter__(self):
self.smaster_opts['sock_dir'],
self.sub_minion_opts['sock_dir'],
self.minion_opts['sock_dir'],
+ TMP
],
pwd.getpwuid(os.getuid()).pw_name)

0 comments on commit 85c6664

Please sign in to comment.