Add Python 3.5 to Travis and Tox configuration

.travis.yml

@@ -1,16 +1,43 @@
 language: python
-python: 2.7
+python: 
+  - 2.7
+  - 3.5
 addons:
   firefox: 47.0.1
-env:
-- TOXENV=tests DISPLAY=:99.0
-- TOXENV=flake8
+matrix:
+  global:
+    - DISPLAY=:99.0
+  include:
+    - python: 2.7
+      env: 
+        - TOXENV=py27
+    - python: 2.7
+      env: 
+        - TOXENV=py27-marionette
+    - python: 2.7
+      env: 
+        - TOXENV=flake8
+    - python: 3.5
+      env: 
+        - TOXENV=py35
+    - python: 3.5
+      env: 
+        - TOXENV=py35-marionette
+    - python: 3.5
+      env: 
+        - TOXENV=flake8
+  exclude:
+    - python: 2.7
+    - python: 3.5
+  allow_failures:
+    - env: 
+       - TOXENV=py35-marionette
 install:
-- pip install tox
+  - pip install tox
 before_script:
-- sh -e /etc/init.d/xvfb start
+  - sh -e /etc/init.d/xvfb start
 script:
-- tox
+  - tox
 notifications:
   email: webqa-ci@mozilla.org
 deploy:

tox.ini

@@ -1,15 +1,18 @@
 [tox]
-envlist = tests, flake8
+envlist = py{27,35}, py{27,35}-marionette, flake8
 
 [testenv]
 passenv = DISPLAY PYTEST_ADDOPTS
 deps =
-    marionette_driver==2.1.0
     mock
-    pytest~=3.0.0
+    pytest==3.0.4
     pytest-selenium
     pytest-xdist==1.15.0
-commands = py.test {posargs}
+    py{27,35}-marionette: marionette_driver==2.1.0
+commands = py.test --ignore tests/marionette {posargs} 
+
+[testenv:marionette]
+commands = py.test {posargs:tests/marionette}
 
 [testenv:flake8]
 skip_install = true