Skip to content

Commit

Permalink
Merge pull request #1423 from gst/use_unittest2
Browse files Browse the repository at this point in the history
Use dedicated setup_test.sh for easier test setup
  • Loading branch information
naparuba committed Jan 8, 2015
2 parents 2a94ee4 + 2143a15 commit 65ea078
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ python:
# command to install dependencies
# some are only used for travis/coveralls so we are installing them here only
install:
- "pip install -r shinken/dependencies"
- "pip install coveralls"
- "pip install nose-cov"
- "pip install unittest2"
- "./bin/preparedev"
- ./test/setup_test.sh
- ./bin/preparedev

# command to run tests
# notice: the nose-cov is used because it is compatible with --processes, but produce a .coverage by process
# so we must combine them in the end
Expand Down
6 changes: 6 additions & 0 deletions test/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# this is the requirements dedicated to tests.

unittest2
mock
coveralls
nose-cov
12 changes: 12 additions & 0 deletions test/setup_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash

set -e

THIS_PATH=$(dirname "$0")
BASE_PATH=$(dirname "$THIS_PATH")

cd $BASE_PATH

# install prog AND tests requirements :
pip install -r shinken/dependencies
pip install -r test/requirements.txt

0 comments on commit 65ea078

Please sign in to comment.