Skip to content

Commit 44c816b

Browse files
committed
quiet some tests
1 parent a45e466 commit 44c816b

File tree

6 files changed

+21
-12
lines changed

6 files changed

+21
-12
lines changed

tests/test_dir_stack.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
88

99
#unset HOOK_VERBOSE_OPTION
1010

11+
oneTimeSetUp() {
12+
test_begin_dir=$(pwd)
13+
}
14+
15+
oneTimeTearDown() {
16+
cd "$test_begin_dir"
17+
}
18+
1119
setUp () {
1220
rm -rf "$WORKON_HOME"
1321
mkdir -p "$WORKON_HOME"
@@ -31,14 +39,15 @@ test_ticket_101 () {
3139
cd "$WORKON_HOME/start_here"
3240
pushd "$WORKON_HOME/on_the_stack"
3341
rmvirtualenv some_env
34-
mkvirtualenv --no-site-packages some_env
42+
mkvirtualenv some_env >/dev/null 2>&1
3543
#echo "After mkvirtualenv: `pwd`"
3644
deactivate
3745
#echo "After deactivate: `pwd`"
3846
popd
3947
#echo "After popd: `pwd`"
4048
current_dir=$(pwd)
4149
assertSame "$WORKON_HOME/start_here" "$current_dir"
50+
4251
}
4352

4453
. "$test_dir/shunit2"

tests/test_ls.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ setUp () {
2222
}
2323

2424
test_get_site_packages_dir () {
25-
mkvirtualenv "lssitepackagestest"
25+
mkvirtualenv "lssitepackagestest" >/dev/null 2>&1
2626
d=$(virtualenvwrapper_get_site_packages_dir)
2727
echo "site-packages in $d"
2828
assertTrue "site-packages dir $d does not exist" "[ -d $d ]"
2929
deactivate
3030
}
3131

3232
test_lssitepackages () {
33-
mkvirtualenv "lssitepackagestest"
33+
mkvirtualenv "lssitepackagestest" >/dev/null 2>&1
3434
contents="$(lssitepackages)"
3535
actual=$(echo $contents | grep easy-install.pth)
3636
expected=$(echo $contents)
@@ -39,7 +39,7 @@ test_lssitepackages () {
3939
}
4040

4141
test_lssitepackages_add2virtualenv () {
42-
mkvirtualenv "lssitepackagestest"
42+
mkvirtualenv "lssitepackagestest" >/dev/null 2>&1
4343
parent_dir=$(dirname $(pwd))
4444
base_dir=$(basename $(pwd))
4545
add2virtualenv "../$base_dir"

tests/test_project_activate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ setUp () {
2626
}
2727

2828
test_activate () {
29-
mkproject myproject
29+
mkproject myproject >/dev/null 2>&1
3030
deactivate
3131
cd $TMPDIR
3232
assertSame "" "$VIRTUAL_ENV"

tests/test_project_templates.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
88
export PROJECT_HOME="$(echo ${TMPDIR:-/tmp}/PROJECT_HOME | sed 's|//|/|g')"
99

1010
oneTimeSetUp() {
11-
(cd "$test_dir/testtemplate" && python setup.py install)
11+
(cd "$test_dir/testtemplate" && rm -rf build && python setup.py install)
1212
rm -rf "$WORKON_HOME"
1313
mkdir -p "$WORKON_HOME"
1414
rm -rf "$PROJECT_HOME"
@@ -32,7 +32,7 @@ test_list_templates () {
3232
}
3333

3434
test_apply_template () {
35-
mkproject -t test proj1
35+
mkproject -t test proj1 >/dev/null 2>&1
3636
assertTrue "Test file not created" "[ -f TEST_FILE ]"
3737
assertTrue "project name not found" "grep -q proj1 TEST_FILE"
3838
}

tests/test_toggleglobalsitepackages.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ oneTimeTearDown() {
1919
setUp () {
2020
echo
2121
rm -f "$test_dir/catch_output"
22-
mkvirtualenv --system-site-packages "globaltest"
22+
mkvirtualenv --system-site-packages "globaltest" >/dev/null 2>&1
2323
}
2424

2525
tearDown () {
26-
deactivate
27-
rmvirtualenv "globaltest"
26+
deactivate >/dev/null 2>&1
27+
rmvirtualenv "globaltest" >/dev/null 2>&1
2828
}
2929

3030
test_toggleglobalsitepackages () {

tests/test_workon.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ oneTimeSetUp() {
1010
rm -rf "$WORKON_HOME"
1111
mkdir -p "$WORKON_HOME"
1212
source "$test_dir/../virtualenvwrapper.sh"
13-
mkvirtualenv "env1"
14-
mkvirtualenv "env2"
13+
mkvirtualenv "env1" >/dev/null 2>&1
14+
mkvirtualenv "env2" >/dev/null 2>&1
1515
deactivate >/dev/null 2>&1
1616
}
1717

0 commit comments

Comments
 (0)