From 8f1f6a89f1211227cbb2e97468c5d07cef64c90c Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 1 May 2019 11:16:25 +0530
Subject: [PATCH 1/5] feat(travis): Python 3.6 tests

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 869fe959c00..f2ba2c43261 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ dist: trusty
 
 python:
   - "2.7"
+  - "3.6"
 
 services:
   - mysql

From 508b3ab8deea1d1994abbc668d41081a44f37a32 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 1 May 2019 11:31:08 +0530
Subject: [PATCH 2/5] fix(travis): Refactor .travis.yml

---
 .travis.yml         | 24 +++++++++---------------
 travis/run-tests.sh | 12 ++++++++++++
 2 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 travis/run-tests.sh

diff --git a/.travis.yml b/.travis.yml
index f2ba2c43261..26a4caa0fbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,10 @@ python:
   - "2.7"
   - "3.6"
 
+env:
+  - TEST_TYPE=Server Side Test
+  - TEST_TYPE=Patch Test
+
 services:
   - mysql
 
@@ -40,18 +44,8 @@ before_script:
   - bench start &
   - sleep 10
 
-jobs:
-  include:
-    - stage: test
-      script:
-        - set -e
-        - bench run-tests --app erpnext --coverage
-      after_script:
-        - coveralls -b apps/erpnext -d ../../sites/.coverage
-      env: Server Side Test
-    - # stage
-      script:
-        - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
-        - bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
-        - bench migrate
-      env: Patch Testing
+script:
+  - $TRAVIS_BUILD_DIR/travis/run-tests.sh
+
+after_script:
+  - coveralls -b apps/erpnext -d ../../sites/.coverage
diff --git a/travis/run-tests.sh b/travis/run-tests.sh
new file mode 100644
index 00000000000..7cfd64833b7
--- /dev/null
+++ b/travis/run-tests.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+if [[ $TEST_TYPE == 'Server Side Test' ]]; then
+    bench run-tests --app erpnext --coverage
+
+elif [[ $TEST_TYPE == 'Patch Test' ]]; then
+    wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
+    bench --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
+    bench migrate
+fi

From 8738f2e1c970f1d931a1878eddf635e6e0e1c340 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 1 May 2019 17:41:36 +0530
Subject: [PATCH 3/5] fix: Set file permissions 755 on travis/run-tests.sh

---
 travis/run-tests.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 travis/run-tests.sh

diff --git a/travis/run-tests.sh b/travis/run-tests.sh
old mode 100644
new mode 100755

From 4e94e26ef8c2cf32cdce0fec552dc67cf09a518e Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 1 May 2019 18:08:44 +0530
Subject: [PATCH 4/5] fix: Minor

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 26a4caa0fbe..ae4bc02fe63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ python:
   - "3.6"
 
 env:
-  - TEST_TYPE=Server Side Test
-  - TEST_TYPE=Patch Test
+  - TEST_TYPE="Server Side Test"
+  - TEST_TYPE="Patch Test"
 
 services:
   - mysql

From 13d01dd69070849d48d4067dcf0e8ca6644b788a Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 1 May 2019 18:25:53 +0530
Subject: [PATCH 5/5] fix: Run script with bash

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ae4bc02fe63..a8a0d826145 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,7 @@ before_script:
   - sleep 10
 
 script:
-  - $TRAVIS_BUILD_DIR/travis/run-tests.sh
+  - bash $TRAVIS_BUILD_DIR/travis/run-tests.sh
 
 after_script:
   - coveralls -b apps/erpnext -d ../../sites/.coverage