Skip to content

Commit

Permalink
chore(tests): Also run tests on Python 2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
adrienverge committed Jul 4, 2017
1 parent 7a8cfee commit 1a961bd
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 10 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
@@ -1,6 +1,7 @@
---
language: python
python:
- 2.6
- 2.7
- 3.3
- 3.4
Expand All @@ -9,9 +10,10 @@ python:
- nightly
install:
- pip install pyyaml flake8 flake8-import-order coveralls
- if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install unittest2; fi
- pip install .
script:
- flake8 .
- if [[ $TRAVIS_PYTHON_VERSION != 2.6 ]]; then flake8 .; fi
- yamllint --strict $(git ls-files '*.yaml' '*.yml')
- coverage run --source=yamllint setup.py test
after_success:
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Expand Up @@ -47,6 +47,5 @@
package_data={'yamllint': ['conf/*.yaml'],
'tests': ['yaml-1.2-spec-examples/*']},
install_requires=['pathspec >=0.5.3', 'pyyaml'],
tests_require=['nose'],
test_suite='nose.collector',
test_suite='tests',
)
7 changes: 6 additions & 1 deletion tests/common.py
Expand Up @@ -16,7 +16,12 @@

import os
import tempfile
import unittest
import sys
try:
assert sys.version_info >= (2, 7)
import unittest
except:
import unittest2 as unittest

import yaml

Expand Down
7 changes: 6 additions & 1 deletion tests/test_cli.py
Expand Up @@ -23,14 +23,19 @@
import os
import pty
import shutil
import unittest
import sys
try:
assert sys.version_info >= (2, 7)
import unittest
except:
import unittest2 as unittest

from yamllint import cli

from tests.common import build_temp_workspace


@unittest.skipIf(sys.version_info < (2, 7), 'Python 2.6 not supported')
class CommandLineTestCase(unittest.TestCase):
@classmethod
def setUpClass(cls):
Expand Down
7 changes: 6 additions & 1 deletion tests/test_config.py
Expand Up @@ -21,7 +21,11 @@
import os
import shutil
import sys
import unittest
try:
assert sys.version_info >= (2, 7)
import unittest
except:
import unittest2 as unittest

from yamllint import cli
from yamllint import config
Expand Down Expand Up @@ -334,6 +338,7 @@ def tearDownClass(cls):

shutil.rmtree(cls.wd)

@unittest.skipIf(sys.version_info < (2, 7), 'Python 2.6 not supported')
def test_run_with_ignored_path(self):
sys.stdout = StringIO()
with self.assertRaises(SystemExit):
Expand Down
8 changes: 6 additions & 2 deletions tests/test_linter.py
Expand Up @@ -15,8 +15,12 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

import io

import unittest
import sys
try:
assert sys.version_info >= (2, 7)
import unittest
except:
import unittest2 as unittest

from yamllint.config import YamlLintConfig
from yamllint import linter
Expand Down
8 changes: 7 additions & 1 deletion tests/test_module.py
Expand Up @@ -18,9 +18,15 @@
import shutil
import subprocess
import tempfile
import unittest
import sys
try:
assert sys.version_info >= (2, 7)
import unittest
except:
import unittest2 as unittest


@unittest.skipIf(sys.version_info < (2, 7), 'Python 2.6 not supported')
class ModuleTestCase(unittest.TestCase):
def setUp(self):
self.wd = tempfile.mkdtemp(prefix='yamllint-tests-')
Expand Down
7 changes: 6 additions & 1 deletion tests/test_parser.py
Expand Up @@ -14,7 +14,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

import unittest
import sys
try:
assert sys.version_info >= (2, 7)
import unittest
except:
import unittest2 as unittest

import yaml

Expand Down

0 comments on commit 1a961bd

Please sign in to comment.