Merge 0fe147c into b504b24

jdiegodcp · Oct 5, 2015 · 3817a7e · 3817a7e
2 parents b504b24 + 0fe147c
commit 3817a7e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -60,7 +60,7 @@ class PyTest(TestCommand):
 
     def initialize_options(self):
         TestCommand.initialize_options(self)
-        self.pytest_args = None
+        self.pytest_args = ''
 
     def finalize_options(self):
         TestCommand.finalize_options(self)
@@ -69,7 +69,7 @@ def finalize_options(self):
 
     def run_tests(self):
         import pytest
-        errno = pytest.main(self.pytest_args or [] + ["tests"])
+        errno = pytest.main(self.pytest_args + ' tests')
         sys.exit(errno)
 
 setup(