Merge pull request #538 from d0ugal/tox

Update Travis and Appveyor test configs

.travis.yml

@@ -5,13 +5,14 @@ env:
 - TOX_ENV=py27-unittests
 - TOX_ENV=py33-unittests
 - TOX_ENV=py34-unittests
+- TOX_ENV=py26-integration
 - TOX_ENV=py27-integration
+- TOX_ENV=py33-integration
 - TOX_ENV=py34-integration
 - TOX_ENV=flake8
 - TOX_ENV=coverage
 install:
 - pip install tox
 script: "./.travis.sh"
 matrix:
-  allow_failures:
-    - env: TOXENV=coverage
+  fast_finish: true

appveyor.yml

@@ -0,0 +1,23 @@
+build: false
+environment:
+  matrix:
+    - TOXENV: py27-unittests
+    - TOXENV: py33-unittests
+    - TOXENV: py34-unittests
+    - TOXENV: py27-integration
+    - TOXENV: py33-integration
+    - TOXENV: py34-integration
+    - TOXENV: flake8
+init:
+  - "ECHO %TOXENV%"
+  - ps: "ls C:\\Python*"
+install:
+  - ps: Invoke-WebRequest "https://bootstrap.pypa.io/ez_setup.py" -OutFile "c:\\ez_setup.py"
+  - ps: Invoke-WebRequest "https://bootstrap.pypa.io/get-pip.py" -OutFile "c:\\get-pip.py"
+  - "c:\\python27\\python c:\\ez_setup.py"
+  - "c:\\python27\\python c:\\get-pip.py"
+  - "c:\\python27\\Scripts\\pip install tox"
+test_script:
+  - "c:\\python27\\Scripts\\tox --version"
+  - "c:\\python27\\Scripts\\pip --version"
+  - "c:\\python27\\Scripts\\tox"

tox.ini

@@ -1,7 +1,6 @@
 [tox]
 envlist =
-    {py26,py27,py33,py34}-unittests,
-    {py27,py34}-integration,
+    {py26,py27,py33,py34}-{unittests,integration,dev-livereload,dev-markdown},
     flake8
 
 [testenv]
@@ -10,8 +9,8 @@ deps=
     -rrequirements/project.txt
     -rrequirements/test.txt
 commands=
-    {py26,py27,py33,py34}-unittests: {envbindir}/nosetests --with-coverage --cover-package mkdocs --cover-html --cover-html-dir {envtmpdir}/coverage mkdocs
-    {py27,py34}-integration: {envbindir}/python {toxinidir}/mkdocs/tests/integration.py --output={envtmpdir}/builds --quiet
+    {py26,py27,py33,py34}-unittests: {envbindir}/nosetests --with-coverage --cover-package mkdocs mkdocs
+    {py26,py27,py33,py34}-integration: {envbindir}/python -m mkdocs.tests.integration --output={envtmpdir}/builds --quiet
 
 [testenv:flake8]
 deps=-rrequirements/test.txt