Fix tests, update test and doc dependencies

coffeestats · May 20, 2018 · 49bc6bb · 49bc6bb
1 parent 5cc541e
commit 49bc6bb
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,17 @@
 language: python
 
+sudo: required
+
 addons:
+  chrome: stable
+  postgresql: '9.4'
   apt:
     packages:
     - libffi-dev
+    - postgresql-server-dev-9.4
+
+services:
+  - postgresql
 
 os:
   - linux
@@ -12,7 +20,7 @@ python:
   - "2.7"
 
 before_install:
-  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x2160x16"
 
 install:
   - pip install -r requirements/test.txt

diff --git a/coffeestats/functional_tests/base.py b/coffeestats/functional_tests/base.py
@@ -21,7 +21,7 @@ class SeleniumTest(StaticLiveServerTestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.selenium = webdriver.Firefox()
+        cls.selenium = webdriver.Chrome()
         cls.selenium.implicitly_wait(10)
         super(SeleniumTest, cls).setUpClass()
         cls.server_url = cls.live_server_url

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -5,7 +5,7 @@ django-model-utils==2.5.2
 django-registration==2.1.2
 django-absolute==0.3
 logutils==0.3.3
-psycopg2==2.6.2
+psycopg2==2.7.4
 passlib==1.6.5
 bcrypt==3.1.1
 pytz==2016.6.1

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1,4 +1,4 @@
 # documentation dependencies go here
 -r base.txt
-Sphinx==1.4.6
-sphinxcontrib-httpdomain==1.5.0
+Sphinx==1.7.4
+sphinxcontrib-httpdomain==1.6.1
diff --git a/requirements/local.txt b/requirements/local.txt
@@ -1,13 +1,12 @@
 # Local development dependencies go here
 -r test.txt
+-r docs.txt
 django-debug-toolbar==1.5
-Sphinx==1.4.6
-sphinxcontrib-httpdomain==1.5.0
 django-extensions==1.7.4
-flake8==3.0.4
-mccabe==0.5.2
+flake8==3.5.0
+mccabe==0.6.1
 pep8==1.7.0
-pyflakes==1.3.0
+pyflakes==1.6.0
 astroid==1.4.8
 colorama==0.3.7
 lazy-object-proxy==1.2.2

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -1,5 +1,5 @@
 # Test dependencies go here.
 -r base.txt
-coverage==4.2
-selenium==2.53.6
+coverage==4.5.1
+selenium==3.12.0
 mock==2.0.0
diff --git a/salt/roots/salt/coffeestats/init.sls b/salt/roots/salt/coffeestats/init.sls
@@ -28,7 +28,7 @@ coffeestats-dependencies:
       - iceweasel
       - libyaml-dev
       - libjpeg-dev
-      - libpng-dev
+      - libpng12-dev
 
 /etc/uwsgi/apps-available/coffeestats.ini:
   file.managed:

diff --git a/salt/roots/salt/coffeestats/run_tests.sh b/salt/roots/salt/coffeestats/run_tests.sh
@@ -8,6 +8,6 @@ set -e
 
 export DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE%%local}test
 cd /vagrant/coffeestats
-xvfb-run -s '-screen 0 1280x1024x16' coverage run --branch manage.py test -v 3 $@
+xvfb-run -s '-screen 0 1920x2160x16' coverage run --branch manage.py test -v 3 $@
 coverage html
 flake8