From 87930b211e3011ad0e2da982519ef5e6ef5ab865 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 29 Aug 2016 17:42:00 +0530
Subject: - Change path of selenium tests - Add to travis

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 8ad6c5f..c70a17a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,10 +14,14 @@ install:
   - pip install -q Django==$DJANGO
   - pip install -q pytz==2016.4
   - pip install -q python-social-auth==0.2.19
+  - pip install selenium
 
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y scilab
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
 
 # command to run tests
 script:
-- 
cgit 


From 953f856edc18ed22c72c56b58171e2ce5bc450e5 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 12 Sep 2016 16:22:55 +0530
Subject: Run the selenium and unit tests separately

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index c70a17a..b44d4e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,3 +26,4 @@ before_install:
 # command to run tests
 script:
   - python manage.py test -v 2 yaksh
+  - python manage.py test -v 2 yaksh.tests.load_test
\ No newline at end of file
-- 
cgit 


From 48f5117a0a0f7f712d3bafabf06e1c63de56e9fa Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 21 Sep 2016 15:51:19 +0530
Subject: Place selenium script and unit tests in live_server_tests dir

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

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index b44d4e2..3484d2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,4 +26,4 @@ before_install:
 # command to run tests
 script:
   - python manage.py test -v 2 yaksh
-  - python manage.py test -v 2 yaksh.tests.load_test
\ No newline at end of file
+  - python manage.py test -v 2 yaksh.live_server_tests
-- 
cgit