File tree Expand file tree Collapse file tree 6 files changed +21
-12
lines changed Expand file tree Collapse file tree 6 files changed +21
-12
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,14 @@ export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
8
8
9
9
# unset HOOK_VERBOSE_OPTION
10
10
11
+ oneTimeSetUp () {
12
+ test_begin_dir=$( pwd)
13
+ }
14
+
15
+ oneTimeTearDown () {
16
+ cd " $test_begin_dir "
17
+ }
18
+
11
19
setUp () {
12
20
rm -rf " $WORKON_HOME "
13
21
mkdir -p " $WORKON_HOME "
@@ -31,14 +39,15 @@ test_ticket_101 () {
31
39
cd " $WORKON_HOME /start_here"
32
40
pushd " $WORKON_HOME /on_the_stack"
33
41
rmvirtualenv some_env
34
- mkvirtualenv --no-site-packages some_env
42
+ mkvirtualenv some_env > /dev/null 2>&1
35
43
# echo "After mkvirtualenv: `pwd`"
36
44
deactivate
37
45
# echo "After deactivate: `pwd`"
38
46
popd
39
47
# echo "After popd: `pwd`"
40
48
current_dir=$( pwd)
41
49
assertSame " $WORKON_HOME /start_here" " $current_dir "
50
+
42
51
}
43
52
44
53
. " $test_dir /shunit2"
Original file line number Diff line number Diff line change @@ -22,15 +22,15 @@ setUp () {
22
22
}
23
23
24
24
test_get_site_packages_dir () {
25
- mkvirtualenv " lssitepackagestest"
25
+ mkvirtualenv " lssitepackagestest" > /dev/null 2>&1
26
26
d=$( virtualenvwrapper_get_site_packages_dir)
27
27
echo " site-packages in $d "
28
28
assertTrue " site-packages dir $d does not exist" " [ -d $d ]"
29
29
deactivate
30
30
}
31
31
32
32
test_lssitepackages () {
33
- mkvirtualenv " lssitepackagestest"
33
+ mkvirtualenv " lssitepackagestest" > /dev/null 2>&1
34
34
contents=" $( lssitepackages) "
35
35
actual=$( echo $contents | grep easy-install.pth)
36
36
expected=$( echo $contents )
@@ -39,7 +39,7 @@ test_lssitepackages () {
39
39
}
40
40
41
41
test_lssitepackages_add2virtualenv () {
42
- mkvirtualenv " lssitepackagestest"
42
+ mkvirtualenv " lssitepackagestest" > /dev/null 2>&1
43
43
parent_dir=$( dirname $( pwd) )
44
44
base_dir=$( basename $( pwd) )
45
45
add2virtualenv " ../$base_dir "
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ setUp () {
26
26
}
27
27
28
28
test_activate () {
29
- mkproject myproject
29
+ mkproject myproject > /dev/null 2>&1
30
30
deactivate
31
31
cd $TMPDIR
32
32
assertSame " " " $VIRTUAL_ENV "
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
8
8
export PROJECT_HOME=" $( echo ${TMPDIR:-/ tmp} /PROJECT_HOME | sed ' s|//|/|g' ) "
9
9
10
10
oneTimeSetUp () {
11
- (cd " $test_dir /testtemplate" && python setup.py install)
11
+ (cd " $test_dir /testtemplate" && rm -rf build && python setup.py install)
12
12
rm -rf " $WORKON_HOME "
13
13
mkdir -p " $WORKON_HOME "
14
14
rm -rf " $PROJECT_HOME "
@@ -32,7 +32,7 @@ test_list_templates () {
32
32
}
33
33
34
34
test_apply_template () {
35
- mkproject -t test proj1
35
+ mkproject -t test proj1 > /dev/null 2>&1
36
36
assertTrue " Test file not created" " [ -f TEST_FILE ]"
37
37
assertTrue " project name not found" " grep -q proj1 TEST_FILE"
38
38
}
Original file line number Diff line number Diff line change @@ -19,12 +19,12 @@ oneTimeTearDown() {
19
19
setUp () {
20
20
echo
21
21
rm -f " $test_dir /catch_output"
22
- mkvirtualenv --system-site-packages " globaltest"
22
+ mkvirtualenv --system-site-packages " globaltest" > /dev/null 2>&1
23
23
}
24
24
25
25
tearDown () {
26
- deactivate
27
- rmvirtualenv " globaltest"
26
+ deactivate > /dev/null 2>&1
27
+ rmvirtualenv " globaltest" > /dev/null 2>&1
28
28
}
29
29
30
30
test_toggleglobalsitepackages () {
Original file line number Diff line number Diff line change @@ -10,8 +10,8 @@ oneTimeSetUp() {
10
10
rm -rf " $WORKON_HOME "
11
11
mkdir -p " $WORKON_HOME "
12
12
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
15
15
deactivate > /dev/null 2>&1
16
16
}
17
17
You can’t perform that action at this time.
0 commit comments