From b8522dae8e959de50c48bfd3fd0bf08f8262d9a3 Mon Sep 17 00:00:00 2001
From: nothink <nothing@yasagure.jp>
Date: Wed, 1 Aug 2018 12:18:45 +0900
Subject: [PATCH] dup tests for python3.7-dev

---
 .travis.yml | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0ab4e898..b1916c65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,13 +11,40 @@ matrix:
     - language: python          # Backend test for on-premise
       python:
         - "3.6"
+      allow_failures:
+        - python: "3.6"
+      before_install:
+        - sudo apt-get -y install software-properties-common
+        - sudo add-apt-repository -y ppa:mc3man/trusty-media
+        - sudo apt-get update
+        - sudo apt-get -y --allow-unauthenticated install ffmpeg
+        - sudo -i -u postgres createuser szuru -D -R -S
+        - sudo -i -u postgres createdb szuru_test
+        - sudo -i -u postgres psql -c "ALTER USER szuru PASSWORD 'dog';"
+        - cd server
+        - cp config.yaml.dist ../config.yaml.dist
+        - cp config.yaml.dist ../config.yaml
+        - sed -i -e 's/^#debug:/debug:/' ../config.yaml
+        - sed -i -e 's/^#show_sql:/show_sql:/' ../config.yaml
+        - sed -i -e 's/^#data_url:/data_url:/' ../config.yaml
+        - sed -i -e 's/^#data_dir:/data_dir:/' ../config.yaml
+        - sed -i -e 's/^#database:$/database:\ postgres:\/\/szuru:dog@localhost:5432\/szuru_test/' ../config.yaml
+        - sed -i -e 's/^#elasticsearch:/elasticsearch:/' ../config.yaml
+        - sed -i -e 's/^#    /    /' ../config.yaml
+      install:
+        - pip install -r requirements.txt
+        - pip install -r dev-requirements.txt
+      script:
+#        - pycodestyle wait-for-es generate-thumb szurubooru/
+        - ./wait-for-es
+        - alembic upgrade head
+        - py.test
+
+    - language: python          # Backend test for on-premise
+      python:
         - "3.7-dev"
-        - "nightly"
-      matrix:
-          allow_failures:
-            - python: "3.6"
-            - python: "3.7-dev"
-            - python: "nightly"
+      allow_failures:
+        - python: "3.7-dev"
       before_install:
         - sudo apt-get -y install software-properties-common
         - sudo add-apt-repository -y ppa:mc3man/trusty-media
@@ -47,9 +74,12 @@ matrix:
 
     - language: node_js          # Frontend test
       node_js:
+        - "6"
+        - "7"
         - "8"
-      before_install:
-        - npm install -g yarn
+        - "9"
+#      before_install:
+#        - npm install -g yarn
       install:
         - cd client/
         - npm install