From: Filippo Valsorda <filippo.valsorda@gmail.com>
Date: Tue, 11 Dec 2012 19:07:35 +0000 (+0100)
Subject: rollback tests multiprocess, Travis and OSX don't support it
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=fedb6816cd045b4a0a12b7cd1a51a1712abde874;p=youtube-dl

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

diff --git a/.gitignore b/.gitignore
index 996489d8e..a4204620b 100644
--- 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 f4c2095d2..1e9b43e16 100644
--- 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 c97d6ffb0..426acd357 100644
--- 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