rollback tests multiprocess, Travis and OSX don't support it

diff --git a/.gitignore b/.gitignore
index 996489d8ec6becd3a441cdbecd1f83c31eea944d..a4204620b8d3cd62fb067aa5983cbea55d08e7c2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ youtube-dl.bash-completion
 youtube-dl
 youtube-dl.exe
 youtube-dl.tar.gz
+.coverage
+cover/

diff --git a/.travis.yml b/.travis.yml
index f4c2095d29a9178cb1a61dea7c24c6ae116f186e..1e9b43e16433c89d814b5849623a7a2546dc1e82 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ python:
   - "2.6"
   - "2.7"
 #  - "3.3"
-script: nosetests test --verbose --processes 4
+script: nosetests test --verbose
 notifications:
   email:
     - filippo.valsorda@gmail.com

diff --git a/Makefile b/Makefile
index c97d6ffb005d9561dc2fede6f613d026d9c0924e..426acd35776425acd62935094aaf8dc53c9793cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,8 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion
        install -m 644 youtube-dl.bash-completion $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/youtube-dl
 
 test:
-       nosetests2 --nocapture test
+       #nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
+       nosetests --verbose test
 
 .PHONY: all clean install test