Adding some test coverage

.travis.yml

@@ -6,5 +6,9 @@ python:
   - "3.3"
   - "3.4"
   - "pypy"
+sudo: false
 install: pip install -r requirements.txt
-script: nosetests
+script:
+  - py.test -v --cov flake8diff --cov-report term-missing
+after_success:
+  - coveralls

flake8diff/exceptions.py

@@ -30,7 +30,7 @@ class UnsupportedVCSError(BaseError):
     """
 
     def __init__(self, vcs=None):
-        msg = '{0} VCS is not unsupported'
+        msg = '{0} VCS is not supported'
         self.message = msg.format(vcs)
         super(UnsupportedVCSError, self).__init__()
 

flake8diff/flake8.py

@@ -104,7 +104,7 @@ def __init__(self, commits, options=None):
 
         self._should_include_violation = getattr(
             self,
-            '_should_include_violation_{}'
+            '_should_include_violation_{0}'
             ''.format(self.options.get('strict_mode', 'only_lines'))
         )
 
@@ -129,7 +129,7 @@ def get_vcs(self):
             try:
                 vcs = vcs(self.commits, self.options)
             except VCSNotInstalledError:
-                logger.error('Seems like {} is not installed'.format(vcs.name))
+                logger.error('Seems like {0} is not installed'.format(vcs.name))
             else:
                 if vcs.is_used() and vcs.check():
                     return vcs
@@ -232,8 +232,6 @@ def process(self):
                 ))
 
                 for line in violations:
-                    print(SIMPLE_OUTPUT.format(
-                        **self.get_color_kwargs(line)
-                    ))
+                    print(SIMPLE_OUTPUT.format(**self.get_color_kwargs(line)))
 
         return overall_violations == 0

flake8diff/main.py

@@ -13,7 +13,8 @@
     $ flake8-diff
 
 """
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
+
 import argparse
 import logging
 import operator
@@ -24,7 +25,6 @@
 from .flake8 import COLORS, STRICT_MODES, Flake8Diff
 from .vcs import SUPPORTED_VCS
 
-
 LOGGING_FORMAT = '%(asctime)-15s %(name)s %(levelname)s %(message)s'
 ENVIRON_PREFIX = 'FLAKE8DIFF_{0}'
 VERBOSITY_MAPPING = {

flake8diff/test_exceptions.py

@@ -0,0 +1,53 @@
+from __future__ import unicode_literals
+
+from unittest import TestCase
+
+from flake8diff.exceptions import (
+    Flake8NotInstalledError,
+    NotLocatableVCSError,
+    UnsupportedVCSError,
+    VCSNotInstalledError,
+    WrongVCSSpecified
+)
+
+
+class ExceptionsTestCase(TestCase):
+    def test_flake8_not_installed(self):
+        expected = "flake8 installation could not be found. Is it on $PATH?"
+
+        try:
+            raise Flake8NotInstalledError
+        except Flake8NotInstalledError as e:
+            self.assertEquals(str(e), expected)
+
+    def test_not_locatable_vcs(self):
+        expected = "VCS could not be determined automatically"
+
+        try:
+            raise NotLocatableVCSError
+        except NotLocatableVCSError as e:
+            self.assertEquals(str(e), expected)
+
+    def test_unsupported_vcs(self):
+        expected = "foo VCS is not supported"
+
+        try:
+            raise UnsupportedVCSError(vcs="foo")
+        except UnsupportedVCSError as e:
+            self.assertEquals(str(e), expected)
+
+    def test_vcs_not_installed(self):
+        expected = 'VCS "bar" installation could not be found. Is it on $PATH?'
+
+        try:
+            raise VCSNotInstalledError(vcs="bar")
+        except VCSNotInstalledError as e:
+            self.assertEquals(str(e), expected)
+
+    def test_wrong_vcs_specified(self):
+        expected = 'This is not a "baz" repository'
+
+        try:
+            raise WrongVCSSpecified(vcs="baz")
+        except WrongVCSSpecified as e:
+            self.assertEquals(str(e), expected)

flake8diff/test_flake8.py

@@ -0,0 +1,8 @@
+from unittest import TestCase
+
+from flake8diff import flake8
+
+
+class Flake8DiffTestCase(TestCase):
+    def test_flake8diff(self):
+        f8d = flake8.Flake8Diff("", {})

flake8diff/test_main.py

@@ -0,0 +1,11 @@
+"""This test is primarily to trigger the argparse code in main.py
+"""
+from unittest import TestCase
+
+from flake8diff import main  # noqa
+
+
+class MainTestCase(TestCase):
+    def test_main(self):
+        # using assertTrue() instead of assertIsNotNone() for py2.6 compat
+        self.assertTrue(main.LOGGING_FORMAT is not None)

flake8diff/test_utils.py

@@ -0,0 +1,19 @@
+import sys
+import unittest
+from subprocess import CalledProcessError
+
+import pytest
+import six
+from flake8diff import utils
+
+
+class UtilsTestCase(unittest.TestCase):
+    def test_execute_success(self):
+        pwd = utils._execute("pwd", strict=True)
+        self.assertTrue(pwd is not "")
+        self.assertTrue(isinstance(pwd, six.string_types))
+
+    @pytest.mark.skipif(sys.version_info < (2, 7), reason="Python >=2.7 needed")
+    def test_execute_failure(self):
+        with self.assertRaises(CalledProcessError):
+            utils._execute("doesnotexist", strict=True)

requirements.txt

@@ -2,6 +2,11 @@ Jinja2==2.7.1
 MarkupSafe==0.18
 Pygments==1.6
 Sphinx==1.2.2
+blessings==1.6
+coveralls==0.5
 docutils==0.11
+flake8==2.4.1
 six==1.9.0
 sphinx-rtd-theme==0.1.6
+pytest==2.7.2
+pytest-cov==1.8.1

tox.ini

@@ -0,0 +1,5 @@
+[tox]
+envlist = py26,py27,py34
+[testenv]
+deps = -rrequirements.txt
+commands = py.test -v