diff options
| author | prathamesh | 2016-09-23 13:15:06 +0530 |
|---|---|---|
| committer | prathamesh | 2016-09-23 13:15:06 +0530 |
| commit | d4a0ace8042f590659b8e7ec02fcdc3a24fe0592 (patch) | |
| tree | fe804651f57ba0e364a11d1719edcf3d260f5ebe /.travis.yml | |
| parent | 03e54d7f6a42c0d9207db554abba9da854d494e4 (diff) | |
| parent | 8e4ead8ab4caa9366e5357840e1912cbfb8cdb85 (diff) | |
| download | online_test-d4a0ace8042f590659b8e7ec02fcdc3a24fe0592.tar.gz online_test-d4a0ace8042f590659b8e7ec02fcdc3a24fe0592.tar.bz2 online_test-d4a0ace8042f590659b8e7ec02fcdc3a24fe0592.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into regrade_papers
Resolved
Conflicts:
yaksh/models.py
yaksh/test_models.py
yaksh/urls.py
yaksh/views.py
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 8ad6c5f..3484d2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,11 +14,16 @@ 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: - python manage.py test -v 2 yaksh + - python manage.py test -v 2 yaksh.live_server_tests |