From b5ac3b8a532c2e632760ed4e3017dd300046797a Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 24 Jul 2019 15:18:52 +0530
Subject: [PATCH 01/26] fix(travis): Remove unnecessary commands

---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a8a0d826145..ace0bfb2434 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,12 +14,6 @@ services:
 
 install:
   # fix mongodb travis error
-  - sudo rm /etc/apt/sources.list.d/mongodb*.list
-  - pip install flake8==3.3.0
-  - flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
-  - sudo rm /etc/apt/sources.list.d/docker.list
-  - sudo apt-get install hhvm && rm -rf /home/travis/.kiex/
-  - sudo apt-get purge -y mysql-common mysql-server mysql-client
   - nvm install 10
   - pip install python-coveralls
   - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py

From c3c168a70dc2e41eb62793079556c3ba45be535a Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 13:42:43 +0530
Subject: [PATCH 02/26] fix(travis): Restructure build matrix

---
 .travis.yml         | 36 +++++++++++++++++++++++++-----------
 travis/run-tests.sh | 12 ------------
 2 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100755 travis/run-tests.sh

diff --git a/.travis.yml b/.travis.yml
index ace0bfb2434..0660779b2d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,34 @@
-language: python
 dist: trusty
 
-python:
-  - "2.7"
-  - "3.6"
-
-env:
-  - TEST_TYPE="Server Side Test"
-  - TEST_TYPE="Patch Test"
+language: python
 
 services:
   - mysql
 
+jobs:
+  include:
+  - name: "Python 2.7 Server Side Test"
+    python: 2.7
+    script: bench run-tests --app erpnext --coverage
+
+  - name: "Python 3.6 Server Side Test"
+    python: 3.6
+    script: bench run-tests --app erpnext --coverage
+
+  - name: "Python 2.7 Patch Test"
+    python: 2.7
+    before_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
+    script: bench migrate
+
+  - name: "Python 3.6 Patch Test"
+    python: 3.6
+    before_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
+    script: bench migrate
+
 install:
   # fix mongodb travis error
   - nvm install 10
@@ -38,8 +55,5 @@ before_script:
   - bench start &
   - sleep 10
 
-script:
-  - bash $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
deleted file mode 100755
index 7cfd64833b7..00000000000
--- a/travis/run-tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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 a162f560dd684a87091e4c6a16a0d7b6abb4c4f9 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:09:34 +0530
Subject: [PATCH 03/26] fix(travis): Use MariaDB 10.3

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

diff --git a/.travis.yml b/.travis.yml
index 0660779b2d4..1561d6ca0fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ dist: trusty
 
 language: python
 
-services:
-  - mysql
+addons:
+  mariadb: 10.3
 
 jobs:
   include:

From 2ec21fa9fbaec2e83276800e7438dd4ed778c1e2 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:10:06 +0530
Subject: [PATCH 04/26] fix(travis): Install coverall after tests

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

diff --git a/.travis.yml b/.travis.yml
index 1561d6ca0fa..c51c6b078e7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,9 +30,7 @@ jobs:
     script: bench migrate
 
 install:
-  # fix mongodb travis error
   - nvm install 10
-  - pip install python-coveralls
   - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
   - sudo python install.py --develop --user travis --without-bench-setup
   - sudo pip install -e ~/bench
@@ -56,4 +54,5 @@ before_script:
   - sleep 10
 
 after_script:
+  - pip install python-coveralls
   - coveralls -b apps/erpnext -d ../../sites/.coverage

From 7165a5d1f8967da240cbf1ec15985cb0000ea366 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:11:18 +0530
Subject: [PATCH 05/26] fix(travis): Do not execute install.py

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

diff --git a/.travis.yml b/.travis.yml
index c51c6b078e7..047a98640f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,11 @@ jobs:
     script: bench migrate
 
 install:
+  - cd ~
   - nvm install 10
-  - wget https://raw.githubusercontent.com/frappe/bench/master/playbooks/install.py
-  - sudo python install.py --develop --user travis --without-bench-setup
-  - sudo pip install -e ~/bench
+
+  - git clone https://github.com/frappe/bench --depth 1
+  - pip install -e ./bench
 
   - rm $TRAVIS_BUILD_DIR/.git/shallow
   - bash $TRAVIS_BUILD_DIR/travis/bench_init.sh

From 5fe2272861c01be593dd7f414b508abf4b96bcd3 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:15:30 +0530
Subject: [PATCH 06/26] fix(travis): Remove travis/bench_init.sh

---
 .travis.yml          | 5 +++--
 travis/bench_init.sh | 8 --------
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100755 travis/bench_init.sh

diff --git a/.travis.yml b/.travis.yml
index 047a98640f5..e0a2ead3d53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,8 +36,9 @@ install:
   - git clone https://github.com/frappe/bench --depth 1
   - pip install -e ./bench
 
-  - rm $TRAVIS_BUILD_DIR/.git/shallow
-  - bash $TRAVIS_BUILD_DIR/travis/bench_init.sh
+  - git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1
+  - bench init --frappe-path ~/frappe --python $(which python) frappe-bench
+
   - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
 
 before_script:
diff --git a/travis/bench_init.sh b/travis/bench_init.sh
deleted file mode 100755
index f96269b919c..00000000000
--- a/travis/bench_init.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-cd ~/
-curl -I https://github.com/frappe/frappe/tree/$TRAVIS_BRANCH | head -n 1 | cut -d $' ' -f2 | (
-	read response;
-	[ $response == '200' ] && branch=$TRAVIS_BRANCH || branch='develop';
-	bench init frappe-bench --frappe-path https://github.com/frappe/frappe.git --frappe-branch $branch --python $(which python)
-)

From 6408949d4363595d852b027573110b21ee19192e Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:18:05 +0530
Subject: [PATCH 07/26] fix(travis): Remove unused files

---
 .travis.yml                                        | 3 ++-
 {test_sites/test_site => .travis}/site_config.json | 4 ++--
 test_sites/apps.txt                                | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename {test_sites/test_site => .travis}/site_config.json (79%)
 delete mode 100644 test_sites/apps.txt

diff --git a/.travis.yml b/.travis.yml
index e0a2ead3d53..108df91e401 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,8 @@ install:
   - git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1
   - bench init --frappe-path ~/frappe --python $(which python) frappe-bench
 
-  - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
+  - mkdir ~/frappe-bench/sites/test_site
+  - cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/
 
 before_script:
   - mysql -u root -ptravis -e 'create database test_frappe'
diff --git a/test_sites/test_site/site_config.json b/.travis/site_config.json
similarity index 79%
rename from test_sites/test_site/site_config.json
rename to .travis/site_config.json
index 48b330bc724..695f6c35178 100644
--- a/test_sites/test_site/site_config.json
+++ b/.travis/site_config.json
@@ -6,7 +6,7 @@
  "mail_login": "test@example.com",
  "mail_password": "test",
  "admin_password": "admin",
- "run_selenium_tests": 1,
- "host_name": "http://localhost:8000",
+ "root_password": "travis",
+ "host_name": "http://test_site:8000",
  "install_apps": ["erpnext"]
 }
\ No newline at end of file
diff --git a/test_sites/apps.txt b/test_sites/apps.txt
deleted file mode 100644
index ee6454915ca..00000000000
--- a/test_sites/apps.txt
+++ /dev/null
@@ -1 +0,0 @@
-erpnext
\ No newline at end of file

From 447b8dab96445264fe466b21c95e15da35cb0049 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:19:30 +0530
Subject: [PATCH 08/26] fix(travis): Setup MariaDB

---
 .travis.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 108df91e401..5ecede08e82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,9 +43,15 @@ install:
   - cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/
 
 before_script:
-  - mysql -u root -ptravis -e 'create database test_frappe'
-  - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
-  - echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis
+  - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
+  - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
+
+  - mysql -u root -e "CREATE DATABASE test_frappe"
+  - mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
+  - mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
+
+  - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
+  - mysql -u root -e "FLUSH PRIVILEGES"
 
   - cd ~/frappe-bench
   - bench get-app erpnext $TRAVIS_BUILD_DIR

From 3168ae7dccbb6430577ea4e0744ce74b1a794758 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:21:19 +0530
Subject: [PATCH 09/26] fix(travis): Do not use use_site

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

diff --git a/.travis.yml b/.travis.yml
index 5ecede08e82..9840ad5e155 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,31 +3,32 @@ dist: trusty
 language: python
 
 addons:
+  hosts: test_site
   mariadb: 10.3
 
 jobs:
   include:
   - name: "Python 2.7 Server Side Test"
     python: 2.7
-    script: bench run-tests --app erpnext --coverage
+    script: bench --site test_site run-tests --app erpnext --coverage
 
   - name: "Python 3.6 Server Side Test"
     python: 3.6
-    script: bench run-tests --app erpnext --coverage
+    script: bench --site test_site run-tests --app erpnext --coverage
 
   - name: "Python 2.7 Patch Test"
     python: 2.7
     before_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
-    script: bench migrate
+    script: bench --site test_site migrate
 
   - name: "Python 3.6 Patch Test"
     python: 3.6
     before_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
-    script: bench migrate
+      - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
+    script: bench --site test_site migrate
 
 install:
   - cd ~
@@ -55,9 +56,8 @@ before_script:
 
   - cd ~/frappe-bench
   - bench get-app erpnext $TRAVIS_BUILD_DIR
-  - bench use test_site
-  - bench reinstall --mariadb-root-username root --mariadb-root-password travis --yes
-  - bench scheduler disable
+  - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes
+  - bench --site test_site scheduler disable
   - sed -i 's/9000/9001/g' sites/common_site_config.json
   - bench start &
   - sleep 10

From 8005f350ae9fccaf3447db356c6e942d5afc31e8 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:21:54 +0530
Subject: [PATCH 10/26] fix(travis): Do not disable scheduler using CLI

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

diff --git a/.travis.yml b/.travis.yml
index 9840ad5e155..cd593a8aed2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,6 @@ before_script:
   - cd ~/frappe-bench
   - bench get-app erpnext $TRAVIS_BUILD_DIR
   - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes
-  - bench --site test_site scheduler disable
   - sed -i 's/9000/9001/g' sites/common_site_config.json
   - bench start &
   - sleep 10

From 28d836cfead1af6581bca8e1ca7107844d8572c3 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:23:24 +0530
Subject: [PATCH 11/26] fix(travis): Execute get-app and reinstall after bench
 start

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

diff --git a/.travis.yml b/.travis.yml
index cd593a8aed2..d3581e2b8d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,11 +55,11 @@ before_script:
   - mysql -u root -e "FLUSH PRIVILEGES"
 
   - cd ~/frappe-bench
-  - bench get-app erpnext $TRAVIS_BUILD_DIR
-  - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes
   - sed -i 's/9000/9001/g' sites/common_site_config.json
   - bench start &
   - sleep 10
+  - bench get-app erpnext $TRAVIS_BUILD_DIR
+  - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes
 
 after_script:
   - pip install python-coveralls

From 09fe604452ca9688f5181d5659efaf67bfa9e189 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:23:43 +0530
Subject: [PATCH 12/26] perf(travis): Do not waste 10 seconds

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

diff --git a/.travis.yml b/.travis.yml
index d3581e2b8d1..23627f51f0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,6 @@ before_script:
   - cd ~/frappe-bench
   - sed -i 's/9000/9001/g' sites/common_site_config.json
   - bench start &
-  - sleep 10
   - bench get-app erpnext $TRAVIS_BUILD_DIR
   - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes
 

From ad2585e1b73aa3907d133f4db7680235ce2c0574 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:25:53 +0530
Subject: [PATCH 13/26] fix(travis): Use MariaDB credentials from
 site_config.json

---
 .travis.yml              | 2 +-
 .travis/site_config.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 23627f51f0e..54d77db7c69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,7 +58,7 @@ before_script:
   - sed -i 's/9000/9001/g' sites/common_site_config.json
   - bench start &
   - bench get-app erpnext $TRAVIS_BUILD_DIR
-  - bench --site test_site reinstall --mariadb-root-username root --mariadb-root-password travis --yes
+  - bench --site test_site reinstall --yes
 
 after_script:
   - pip install python-coveralls
diff --git a/.travis/site_config.json b/.travis/site_config.json
index 695f6c35178..dae80095d45 100644
--- a/.travis/site_config.json
+++ b/.travis/site_config.json
@@ -6,6 +6,7 @@
  "mail_login": "test@example.com",
  "mail_password": "test",
  "admin_password": "admin",
+ "root_login": "root",
  "root_password": "travis",
  "host_name": "http://test_site:8000",
  "install_apps": ["erpnext"]

From 3c21ac6bb6b20d66e89d68c6ad2c26dbfa882889 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:27:20 +0530
Subject: [PATCH 14/26] perf(travis): Remove unnecessary processes from
 Procfile

---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 54d77db7c69..2637d978e4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,12 @@ before_script:
   - mysql -u root -e "FLUSH PRIVILEGES"
 
   - cd ~/frappe-bench
-  - sed -i 's/9000/9001/g' sites/common_site_config.json
+
+  - sed -i 's/watch:/# watch:/g' Procfile
+  - sed -i 's/schedule:/# schedule:/g' Procfile
+  - sed -i 's/socketio:/# socketio:/g' Procfile
+  - sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
+
   - bench start &
   - bench get-app erpnext $TRAVIS_BUILD_DIR
   - bench --site test_site reinstall --yes

From 164057fa5b2970bf1c3d9442540b4d3d8f5b86c1 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:28:15 +0530
Subject: [PATCH 15/26] perf(travis): Do not build assets

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

diff --git a/.travis.yml b/.travis.yml
index 2637d978e4a..e3d432a5ae0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - pip install -e ./bench
 
   - git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1
-  - bench init --frappe-path ~/frappe --python $(which python) frappe-bench
+  - bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench
 
   - mkdir ~/frappe-bench/sites/test_site
   - cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/

From 172a8f1ceacbfd214b2d5f20d62730a1c704203e Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:36:22 +0530
Subject: [PATCH 16/26] perf(travis): Use travis optimizations

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

diff --git a/.travis.yml b/.travis.yml
index e3d432a5ae0..ee385d0e089 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,12 @@ dist: trusty
 
 language: python
 
+git:
+  depth: 1
+
+cache:
+  - pip
+
 addons:
   hosts: test_site
   mariadb: 10.3

From eb6d74217c1857a547487b8f5c81fc4d911bd4bc Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:38:07 +0530
Subject: [PATCH 17/26] fix(travis): Execute get-app before bench start

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

diff --git a/.travis.yml b/.travis.yml
index ee385d0e089..2f7637372e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,8 +67,8 @@ before_script:
   - sed -i 's/socketio:/# socketio:/g' Procfile
   - sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
 
-  - bench start &
   - bench get-app erpnext $TRAVIS_BUILD_DIR
+  - bench start &
   - bench --site test_site reinstall --yes
 
 after_script:

From 70a1c1bdac4434a9dab552828ac1e426eead0a4b Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:39:30 +0530
Subject: [PATCH 18/26] fix(travis): Merge install and before_script

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

diff --git a/.travis.yml b/.travis.yml
index 2f7637372e6..fb941f3ff35 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,6 @@ install:
   - mkdir ~/frappe-bench/sites/test_site
   - cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/
 
-before_script:
   - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
   - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
 

From 42fd7451bf344f51dede2b96f6d78f9430cf5411 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:50:46 +0530
Subject: [PATCH 19/26] fix(travis): Use --site parameter

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

diff --git a/.travis.yml b/.travis.yml
index fb941f3ff35..9b51c85eca1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ jobs:
     python: 2.7
     before_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 --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
     script: bench --site test_site migrate
 
   - name: "Python 3.6 Patch Test"

From 61211486bc2718460d1b94026ed8701ac24b42cc Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 21:51:12 +0530
Subject: [PATCH 20/26] fix(travis): Remove redundant arguments

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

diff --git a/.travis.yml b/.travis.yml
index 9b51c85eca1..53c67fe15d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,14 +26,14 @@ jobs:
     python: 2.7
     before_script:
       - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
-      - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
+      - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz
     script: bench --site test_site migrate
 
   - name: "Python 3.6 Patch Test"
     python: 3.6
     before_script:
       - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
-      - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz --mariadb-root-password travis
+      - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz
     script: bench --site test_site migrate
 
 install:

From 9a009a1d1cf5ab79d11eb1e3b6fc2cfd57a0b820 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 22:40:26 +0530
Subject: [PATCH 21/26] fix(travis): Install wkhtmltopdf

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

diff --git a/.travis.yml b/.travis.yml
index 53c67fe15d7..40afeee8d46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,6 +59,11 @@ install:
   - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
   - mysql -u root -e "FLUSH PRIVILEGES"
 
+  - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
+  - tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
+  - sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
+  - sudo chmod o+x /usr/local/bin/wkhtmltopdf
+
   - cd ~/frappe-bench
 
   - sed -i 's/watch:/# watch:/g' Procfile

From e2108d75dc40c15e7e93e0e4515765e9591008fe Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 25 Jul 2019 23:37:43 +0530
Subject: [PATCH 22/26] perf(tests): Use setUpClass and tearDownClass instead
 of setUp and tearDown

---
 .../doctype/purchase_invoice/test_purchase_invoice.py      | 7 +++++--
 .../accounts/doctype/sales_invoice/test_sales_invoice.py   | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index b4d584fbdef..6deee381481 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -20,11 +20,13 @@ test_dependencies = ["Item", "Cost Center", "Payment Term", "Payment Terms Templ
 test_ignore = ["Serial No"]
 
 class TestPurchaseInvoice(unittest.TestCase):
-	def setUp(self):
+	@classmethod
+	def setUpClass(self):
 		unlink_payment_on_cancel_of_invoice()
 		frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
 
-	def tearDown(self):
+	@classmethod
+	def tearDownClass(self):
 		unlink_payment_on_cancel_of_invoice(0)
 
 	def test_gl_entries_without_perpetual_inventory(self):
@@ -91,6 +93,7 @@ class TestPurchaseInvoice(unittest.TestCase):
 		pi_doc = frappe.get_doc('Purchase Invoice', pi_doc.name)
 
 		self.assertRaises(frappe.LinkExistsError, pi_doc.cancel)
+		unlink_payment_on_cancel_of_invoice()
 
 	def test_purchase_invoice_for_blocked_supplier(self):
 		supplier = frappe.get_doc('Supplier', '_Test Supplier')
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index bfcbe5a98eb..24358abffaf 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -28,10 +28,12 @@ class TestSalesInvoice(unittest.TestCase):
 		w.submit()
 		return w
 
-	def setUp(self):
+	@classmethod
+	def setUpClass(self):
 		unlink_payment_on_cancel_of_invoice()
 
-	def tearDown(self):
+	@classmethod
+	def tearDownClass(self):
 		unlink_payment_on_cancel_of_invoice(0)
 
 	def test_timestamp_change(self):
@@ -134,6 +136,7 @@ class TestSalesInvoice(unittest.TestCase):
 		unlink_payment_on_cancel_of_invoice(0)
 		si = frappe.get_doc('Sales Invoice', si.name)
 		self.assertRaises(frappe.LinkExistsError, si.cancel)
+		unlink_payment_on_cancel_of_invoice()
 
 	def test_sales_invoice_calculation_export_currency(self):
 		si = frappe.copy_doc(test_records[2])

From 503d1d3291a5ee026fa60f57ca8fe865b628397c Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Fri, 26 Jul 2019 00:38:51 +0530
Subject: [PATCH 23/26] perf(tests): Do not unnecessarily create companies

---
 erpnext/tests/test_notifications.py | 44 ++++++++++-------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/erpnext/tests/test_notifications.py b/erpnext/tests/test_notifications.py
index 596bc80deea..1fd90beef0f 100644
--- a/erpnext/tests/test_notifications.py
+++ b/erpnext/tests/test_notifications.py
@@ -2,45 +2,31 @@
 # MIT License. See license.txt
 
 from __future__ import unicode_literals
+import frappe
 import unittest
 
 from frappe.desk import notifications
 from frappe.test_runner import make_test_objects
 
 class TestNotifications(unittest.TestCase):
-	def setUp(self):
-		test_records_company = [
-			{
-				"abbr": "_TC6",
-				"company_name": "_Test Company 6",
-				"country": "India",
-				"default_currency": "INR",
-				"doctype": "Company",
-				"domain": "Manufacturing",
-				"monthly_sales_target": 2000,
-				"chart_of_accounts": "Standard"
-			},
-			{
-				"abbr": "_TC7",
-				"company_name": "_Test Company 7",
-				"country": "United States",
-				"default_currency": "USD",
-				"doctype": "Company",
-				"domain": "Retail",
-				"monthly_sales_target": 10000,
-				"total_monthly_sales": 1000,
-				"chart_of_accounts": "Standard"
-			},
-		]
-
-		make_test_objects('Company', test_records=test_records_company, reset=True)
-
 	def test_get_notifications_for_targets(self):
 		'''
 			Test notification config entries for targets as percentages
 		'''
 
+		company = frappe.get_all("Company")[0]
+		frappe.db.set_value("Company", company.name, "monthly_sales_target", 10000)
+		frappe.db.set_value("Company", company.name, "total_monthly_sales", 1000)
+
 		config = notifications.get_notification_config()
 		doc_target_percents = notifications.get_notifications_for_targets(config, {})
-		self.assertEqual(doc_target_percents['Company']['_Test Company 7'], 10)
-		self.assertEqual(doc_target_percents['Company']['_Test Company 6'], 0)
+
+		self.assertEqual(doc_target_percents['Company'][company.name], 10)
+
+		frappe.db.set_value("Company", company.name, "monthly_sales_target", 2000)
+		frappe.db.set_value("Company", company.name, "total_monthly_sales", 0)
+
+		config = notifications.get_notification_config()
+		doc_target_percents = notifications.get_notifications_for_targets(config, {})
+
+		self.assertEqual(doc_target_percents['Company'][company.name], 0)

From 4fbf03c760b8a36529b20ebb3bcf8bc7b1627754 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Fri, 26 Jul 2019 01:09:01 +0530
Subject: [PATCH 24/26] perf(tests): Use country with lesser fixtures

---
 erpnext/hr/doctype/staffing_plan/test_staffing_plan.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py b/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py
index 22dba99af00..e0f91cad652 100644
--- a/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py
+++ b/erpnext/hr/doctype/staffing_plan/test_staffing_plan.py
@@ -92,5 +92,5 @@ def make_company():
 	company.abbr = "_TC10"
 	company.parent_company = "_Test Company"
 	company.default_currency = "INR"
-	company.country = "India"
+	company.country = "Pakistan"
 	company.insert()

From 5b14ca081c2083ff82627bcfbe9193d232e9281a Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Fri, 26 Jul 2019 03:06:23 +0530
Subject: [PATCH 25/26] perf(travis): Use setUpClass instead of setUp

---
 .../test_stock_reconciliation.py              | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 2dc585b8d63..eea23481c20 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -15,9 +15,10 @@ from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
 from erpnext.stock.doctype.item.test_item import create_item
 
 class TestStockReconciliation(unittest.TestCase):
-	def setUp(self):
+	@classmethod
+	def setUpClass(self):
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
-		self.insert_existing_sle()
+		insert_existing_sle()
 
 	def test_reco_for_fifo(self):
 		self._test_reco_sle_gle("FIFO")
@@ -94,17 +95,17 @@ class TestStockReconciliation(unittest.TestCase):
 		self.assertEqual(["_Test Stock Reco Item", "_Test Warehouse Ledger 1 - _TC", 100],
 			[items[0]["item_code"], items[0]["warehouse"], items[0]["qty"]])
 
-	def insert_existing_sle(self):
-		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+def insert_existing_sle():
+	from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
 
-		make_stock_entry(posting_date="2012-12-15", posting_time="02:00", item_code="_Test Item",
-			target="_Test Warehouse - _TC", qty=10, basic_rate=700)
+	make_stock_entry(posting_date="2012-12-15", posting_time="02:00", item_code="_Test Item",
+		target="_Test Warehouse - _TC", qty=10, basic_rate=700)
 
-		make_stock_entry(posting_date="2012-12-25", posting_time="03:00", item_code="_Test Item",
-			source="_Test Warehouse - _TC", qty=15)
+	make_stock_entry(posting_date="2012-12-25", posting_time="03:00", item_code="_Test Item",
+		source="_Test Warehouse - _TC", qty=15)
 
-		make_stock_entry(posting_date="2013-01-05", posting_time="07:00", item_code="_Test Item",
-			target="_Test Warehouse - _TC", qty=15, basic_rate=1200)
+	make_stock_entry(posting_date="2013-01-05", posting_time="07:00", item_code="_Test Item",
+		target="_Test Warehouse - _TC", qty=15, basic_rate=1200)
 
 def create_stock_reconciliation(**args):
 	args = frappe._dict(args)

From 8a19cd10966e8a8df45a1b282e7027396e95a0c3 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Fri, 26 Jul 2019 03:51:45 +0530
Subject: [PATCH 26/26] perf(tests): Remove unnecessary tearDown code

---
 .../doctype/stock_settings/test_stock_settings.py     | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/erpnext/stock/doctype/stock_settings/test_stock_settings.py b/erpnext/stock/doctype/stock_settings/test_stock_settings.py
index 1e83ec2f499..42a78f723d3 100644
--- a/erpnext/stock/doctype/stock_settings/test_stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/test_stock_settings.py
@@ -8,16 +8,7 @@ import unittest
 
 class TestStockSettings(unittest.TestCase):
 	def setUp(self):
-		settings = frappe.get_single('Stock Settings')
-		settings.clean_description_html = 0
-		settings.save()
-
-		frappe.delete_doc('Item', 'Item for description test')
-
-	def tearDown(self):
-		settings = frappe.get_single('Stock Settings')
-		settings.clean_description_html = 1
-		settings.save()
+		frappe.db.set_value("Stock Settings", None, "clean_description_html", 0)
 
 	def test_settings(self):
 		item = frappe.get_doc(dict(