Merge pull request #18 from codacy/restructure_tests

Move makefile instructions into tox

Author: machadoit

Makefile

@@ -12,6 +12,12 @@ dependencies:
 
 test:
   override:
-    - make test-all
-    - make install
-    - make coverage
+    - tox -e py27,py350,pep8,pyflakes,coverage
+    - python setup.py develop
+
+deployment:
+  coverage:
+    branch: master
+    commands:
+      - tox -e upload_coverage
+

circle.yml

@@ -7,7 +7,7 @@
         "1": 1,
         "4": 1
       },
-      "filename": "src/codacy/__init__.py"
+      "filename": "__init__.py"
     },
     {
       "total": 49,
@@ -42,7 +42,7 @@
         "34": 1,
         "57": 1
       },
-      "filename": "src/codacy/reporter.py"
+      "filename": "reporter.py"
     }
   ],
   "language": "python"

tests/filepath/coverage.json

@@ -1,9 +1,20 @@
+
+import json
+import os
 import unittest
+
 import codacy.reporter
-import json
+
+
+HERE = os.path.abspath(os.path.dirname(__file__))
+
+
+def _file_location(*args):
+    return os.path.join(HERE, *args)
 
 
 class ReporterTests(unittest.TestCase):
+
     def compare_parse_result(self, generated_filename, expected_filename):
         def file_get_contents(filename):
             with open(filename) as f:
@@ -19,17 +30,20 @@ def file_get_contents(filename):
     def test_parser_coverage3(self):
         self.maxDiff = None
 
-        self.compare_parse_result('tests/coverage3/cobertura.xml', 'tests/coverage3/coverage.json')
+        self.compare_parse_result(_file_location('coverage3', 'cobertura.xml'),
+                                  _file_location('coverage3', 'coverage.json'))
 
     def test_parser_coverage4(self):
         self.maxDiff = None
 
-        self.compare_parse_result('tests/coverage4/cobertura.xml', 'tests/coverage4/coverage.json')
+        self.compare_parse_result(_file_location('coverage4', 'cobertura.xml'),
+                                  _file_location('coverage4', 'coverage.json'))
 
     def test_parser_git_filepath(self):
         self.maxDiff = None
 
-        self.compare_parse_result('tests/filepath/cobertura.xml', 'tests/filepath/coverage.json')
+        self.compare_parse_result(_file_location('filepath', 'cobertura.xml.tpl'),
+                                  _file_location('filepath', 'coverage.json'))
 
 
 if __name__ == '__main__':

tests.py renamed to tests/tests.py

@@ -1,6 +1,32 @@
 [tox]
-envlist = py27, py350
+envlist = py27, py350, pep8, pyflakes
 
 [testenv]
-commands = make test
-whitelist_externals=make
+commands = {envpython} -m unittest discover -s tests -p "*test*"
+deps = requests
+
+[testenv:pep8]
+deps =
+    pep8
+commands =
+    {envpython} -m pep8 src
+
+[testenv:pyflakes]
+deps =
+    pyflakes
+commands =
+    {envpython} -m pyflakes src
+
+[testenv:coverage]
+deps = coverage
+commands =
+    {envpython} -m coverage run --source {envsitepackagesdir}/codacy/ -m unittest discover -p "*test*" -s tests
+    {envpython} -m coverage xml
+
+[testenv:upload_coverage]
+deps = coverage
+passenv = CODACY_PROJECT_TOKEN
+commands =
+    python-codacy-coverage -r coverage.xml
+    
+