Fix coverage to sum all coverage across versions

This means any code that is Py2 or Py3 only is counted properly in
coverage reports

Author: ryansb

cfn_resource.py

@@ -57,10 +57,10 @@ def wrapper_func(event, context):
         logger.info("Responding to '%s' request with: %s" % (
             event['RequestType'], serialized))
 
-        if sys.version_info.major ==3:
+        if sys.version_info.major == 3:
             req_data = serialized.encode('utf-8')
         else:
-            req_data=serialized
+            req_data = serialized
         req = Request(
             event['ResponseURL'], data=req_data,
             headers={'Content-Length': len(req_data),

pytest.ini

@@ -1,4 +1,3 @@
 [pytest]
 looponfailroots = .
-addopts = --cov-config .coveragerc --cov .
-#addopts = --cov . --cov-report=html -f
+#addopts = -f

test-requirements.txt

@@ -1,5 +1,4 @@
 mock
 vcrpy
 pytest
-pytest-cov
-pytest-xdist
+coverage>=4.2

tox.ini

@@ -1,6 +1,14 @@
 [tox]
-envlist = py27,py36
+envlist = py27,py36,coverage-report
 
 [testenv]
 deps = -rtest-requirements.txt
-commands = pytest {posargs}
+commands = coverage run --parallel -m pytest {posargs}
+
+[testenv:coverage-report]
+deps = coverage
+skip_install = true
+commands =
+    coverage combine
+    coverage html
+    coverage report