##// END OF EJS Templates
Merge pull request #5740 from minrk/travis-test-js...
Thomas Kluyver -
r16472:b2b3102f merge
parent child Browse files
Show More
@@ -3,16 +3,18 b' language: python'
3 python:
3 python:
4 - 2.7
4 - 2.7
5 - 3.3
5 - 3.3
6 env:
7 - GROUP=
8 - GROUP=js
6 before_install:
9 before_install:
7 # workaround for https://github.com/travis-ci/travis-cookbooks/issues/155
10 # workaround for https://github.com/travis-ci/travis-cookbooks/issues/155
8 - sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm
11 - sudo rm -rf /dev/shm && sudo ln -s /run/shm /dev/shm
9 - easy_install -q pyzmq
10 - pip install jinja2 sphinx pygments tornado requests mock
11 # Pierre Carrier's PPA for PhantomJS and CasperJS
12 # Pierre Carrier's PPA for PhantomJS and CasperJS
12 - sudo add-apt-repository -y ppa:pcarrier/ppa
13 - time sudo add-apt-repository -y ppa:pcarrier/ppa
13 - sudo apt-get update
14 - time sudo apt-get update
14 - sudo apt-get install pandoc casperjs nodejs
15 - time sudo apt-get install pandoc casperjs nodejs libzmq3-dev
16 - time pip install jinja2 sphinx pygments tornado requests mock pyzmq
15 install:
17 install:
16 - python setup.py install -q
18 - time python setup.py install -q
17 script:
19 script:
18 - cd /tmp && iptest
20 - cd /tmp && iptest $GROUP
@@ -306,9 +306,11 b' def prepare_controllers(options):'
306 js_testgroups = [g for g in testgroups if g not in py_testgroups]
306 js_testgroups = [g for g in testgroups if g not in py_testgroups]
307 else:
307 else:
308 py_testgroups = py_test_group_names
308 py_testgroups = py_test_group_names
309 js_testgroups = all_js_groups()
310 if not options.all:
309 if not options.all:
310 js_testgroups = []
311 test_sections['parallel'].enabled = False
311 test_sections['parallel'].enabled = False
312 else:
313 js_testgroups = all_js_groups()
312
314
313 c_js = [JSController(name) for name in js_testgroups]
315 c_js = [JSController(name) for name in js_testgroups]
314 c_py = [PyTestController(name, options) for name in py_testgroups]
316 c_py = [PyTestController(name, options) for name in py_testgroups]
General Comments 0
You need to be logged in to leave comments. Login now