[Pkg-bitcoin-commits] [python-quamash] 112/269: Ignore Windows logic on non-Windows and vice versa

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository python-quamash.

commit bbf9f8304ee2bc71f961cf904bc0e342a58f76a4
Author: Arve Knudsen <arve.knudsen at gmail.com>
Date:   Mon Jul 21 21:33:35 2014 +0200

    Ignore Windows logic on non-Windows and vice versa
---
 .travis.yml | 2 +-
 conftest.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7189f6c..89d9752 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,4 @@ before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 install: "pip install pyside pytest-pep8 pytest-cov pytest-flakes"
-script: py.test -s
+script: py.test
diff --git a/conftest.py b/conftest.py
index bcebec0..6f26048 100644
--- a/conftest.py
+++ b/conftest.py
@@ -5,3 +5,7 @@ sys.path.insert(0, os.path.dirname(__file__))
 logging.basicConfig(
 	level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(name)s - %(message)s')
 
+if os.name == 'nt':
+    collect_ignore = ['quamash/_unix.py']
+else:
+    collect_ignore = ['quamash/_windows.py']
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/python-quamash.git