resolve conflict on tests dispatch

Author: Thomas Desvenain

.hgtags

@@ -38,3 +38,6 @@ c50385e9c99b207f56a968926b0f7e21a2b09366 1.22
 e55e8a54de7be78b8400632ab004abb29aaa8899 1.23
 b243d023094b6b0ef1b834dcc100f8c342c67537 1.24
 4a8870326d84f97d5539b586b21419ba330fea48 1.24.1
+f318697791416cf0897091718d542e8045854233 1.24.2
+06229877a640ecb490faf46f923d8be916a0ebed 1.25
+51eef82a39d431cee156fea7005fa1631e21655e 1.26

docsource/command_ref.rst

@@ -93,7 +93,16 @@ cdsitepackages
 
 Because the exact path to the site-packages directory in the virtualenv depends on the
 version of Python, ``cdsitepackages`` is provided as a shortcut for ``cdvirtualenv
-lib/python${pyvers}/site-packages``.
+lib/python${pyvers}/site-packages``. An optional argument is also allowed, to specify 
+a directory hierarchy within the ``site-packages`` directory to change into.
+
+::
+  $ workon pymotw
+  $ echo $VIRTUAL_ENV
+  /Users/dhellmann/.virtualenvs/pymotw
+  $ cdsitepackages PyMOTW/bisect/
+  $ pwd
+  /Users/dhellmann/.virtualenvs/pymotw/lib/python2.6/site-packages/PyMOTW/bisect
 
 ===============
 Path Management

docsource/history.rst

@@ -4,6 +4,29 @@ Release History
 
   - Added cpvirtualenv command [Thomas Desvenain]
 
+1.26
+
+  - Fix a problem with error messages showing up during init for users
+    with the wrappers installed site-wide but who are not actually
+    using them.  See issue #26.
+  - Split up the tests into multiple files.
+  - Run all tests with all supported shells.
+
+1.25
+
+  - Merged in changes to cdsitepackages from William McVey.  It now
+    takes an argument and supports tab-completion for directories
+    within site-packages.
+
+1.24.2
+
+  - Add user provided :ref:`tips-and-tricks` section.
+  - Add link to Rich Leland's screencast to :ref:`references` section.
+
+1.24.1
+
+  - Add license text to the header of the script.
+
 1.24
 
   - Resolve a bug with the preactivate hook not being run properly.

docsource/index.rst

@@ -57,6 +57,8 @@ Details
    history
    developers
 
+.. _references:
+
 ==========
 References
 ==========

docsource/tips.rst

@@ -1,3 +1,5 @@
+.. _tips-and-tricks:
+
 =================
  Tips and Tricks
 =================

pavement.py

@@ -27,7 +27,7 @@
 
 # What project are we building?
 PROJECT = 'virtualenvwrapper'
-VERSION = '1.24.1'
+VERSION = '1.26'
 os.environ['VERSION'] = VERSION
 
 # Read the long description to give to setup
@@ -192,7 +192,14 @@ def test_install(options):
 
 @task
 def test():
-    sh('bash ./tests/test.sh')
-    sh('SHUNIT_PARENT=./tests/test.sh zsh -o shwordsplit ./tests/test.sh')
-    sh('bash ./tests/test_misconfigured.sh')
+    #test_scripts = glob.glob('./tests/test*.sh')
+    test_scripts = path('tests').glob('test*.sh')
+    print test_scripts
+    for shell_cmd in [ 'bash', 'sh', 'SHUNIT_PARENT=%(test_script)s zsh -o shwordsplit' ]:
+        for test_script in test_scripts:
+            base_cmd = shell_cmd + ' %(test_script)s'
+            cmd = base_cmd % locals()
+            print '*' * 80
+            print
+            sh(cmd)
     return

tests/test_install.sh tests/manual_test_install.shtests/test_install.sh renamed to tests/manual_test_install.sh

@@ -9,7 +9,7 @@ version="$2"
 
 export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
 mkvirtualenv "installtest"
-easy_install "$dist_dir/virtualenvwrapper-$version.tar.gz"
+pip install "$dist_dir/virtualenvwrapper-$version.tar.gz"
 RC=$?
 
 rm -rf "$WORKON_HOME"

tests/test_add2virtualenv.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+#set -x
+
+test_dir=$(dirname $0)
+source "$test_dir/../virtualenvwrapper_bashrc"
+
+export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
+
+oneTimeSetUp() {
+    rm -rf "$WORKON_HOME"
+    mkdir -p "$WORKON_HOME"
+}
+
+oneTimeTearDown() {
+    rm -rf "$WORKON_HOME"
+}
+
+setUp () {
+    echo
+    rm -f "$test_dir/catch_output"
+}
+
+test_add2virtualenv () {
+    mkvirtualenv "pathtest"
+    add2virtualenv "/full/path"
+    cdsitepackages
+    path_file="./virtualenv_path_extensions.pth"
+    assertTrue "No /full/path in `cat $path_file`" "grep /full/path $path_file"
+    cd -
+}
+
+test_add2virtualenv_relative () {
+    mkvirtualenv "pathtest"
+    parent_dir=$(dirname $(pwd))
+    base_dir=$(basename $(pwd))
+    add2virtualenv "../$base_dir"
+    cdsitepackages
+    path_file="./virtualenv_path_extensions.pth"
+    assertTrue "No $parent_dir/$base_dir in \"`cat $path_file`\"" "grep \"$parent_dir/$base_dir\" $path_file"
+    cd - >/dev/null 2>&1
+}
+
+
+. "$test_dir/shunit2"

tests/test_cd.sh

@@ -0,0 +1,69 @@
+#!/bin/sh
+
+#set -x
+
+test_dir=$(dirname $0)
+source "$test_dir/../virtualenvwrapper_bashrc"
+
+export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
+
+oneTimeSetUp() {
+    rm -rf "$WORKON_HOME"
+    mkdir -p "$WORKON_HOME"
+}
+
+oneTimeTearDown() {
+    rm -rf "$WORKON_HOME"
+}
+
+setUp () {
+    echo
+    rm -f "$test_dir/catch_output"
+}
+
+test_cdvirtual() {
+    pushd "$(pwd)" >/dev/null
+    cdvirtualenv
+    assertSame "$VIRTUAL_ENV" "$(pwd)"
+    cdvirtualenv bin
+    assertSame "$VIRTUAL_ENV/bin" "$(pwd)"
+    popd >/dev/null
+}
+
+test_cdsitepackages () {
+    pushd "$(pwd)" >/dev/null   
+    cdsitepackages
+    pyvers=$(python -V 2>&1 | cut -f2 -d' ' | cut -f1-2 -d.)
+    sitepackages="$VIRTUAL_ENV/lib/python${pyvers}/site-packages"
+    assertSame "$sitepackages" "$(pwd)"
+    popd >/dev/null
+}
+
+test_cdsitepackages_with_arg () {
+    pushd "$(pwd)" >/dev/null
+    pyvers=$(python -V 2>&1 | cut -f2 -d' ' | cut -f1-2 -d.)
+    sitepackage_subdir="$VIRTUAL_ENV/lib/python${pyvers}/site-packages/subdir"
+    mkdir -p "${sitepackage_subdir}"
+    cdsitepackages subdir
+    assertSame "$sitepackage_subdir" "$(pwd)"
+    popd >/dev/null
+}
+
+test_cdvirtualenv_no_workon_home () {
+    old_home="$WORKON_HOME"
+    export WORKON_HOME="$WORKON_HOME/not_there"
+    output=`cdvirtualenv 2>&1`
+    assertTrue "Did not see expected message" "echo $output | grep 'does not exist'"
+    WORKON_HOME="$old_home"
+}
+
+test_cdsitepackages_no_workon_home () {
+    old_home="$WORKON_HOME"
+    export WORKON_HOME="$WORKON_HOME/not_there"
+    output=`cdsitepackages 2>&1`
+    assertTrue "Did not see expected message" "echo $output | grep 'does not exist'"
+    WORKON_HOME="$old_home"
+}
+
+
+. "$test_dir/shunit2"

tests/test_cp.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+#set -x
+
+test_dir=$(dirname $0)
+source "$test_dir/../virtualenvwrapper_bashrc"
+
+export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
+
+oneTimeSetUp() {
+    rm -rf "$WORKON_HOME"
+    mkdir -p "$WORKON_HOME"
+}
+
+oneTimeTearDown() {
+    rm -rf "$WORKON_HOME"
+}
+
+setUp () {
+    echo
+    rm -f "$test_dir/catch_output"
+}
+
+
+test_cpvirtualenv () {
+    mkvirtualenv "cpvirtualenvtest"
+    $VIRTUAL_ENV/bin/easy_install "tests/testpackage"
+    cpvirtualenv "cpvirtualenvtest" "cpvirtualenvcopy"
+    deactivate
+    rmvirtualenv "cpvirtualenvtest"
+    workon "cpvirtualenvcopy"
+    testscript="$(which testscript.py)"
+    assertSame "$testscript" $(echo "$WORKON_HOME/cpvirtualenvcopy/bin/testscript.py")
+    testscriptcontent="$(cat $testscript)"
+    assertTrue "No cpvirtualenvtest in $/testscriptcontent" "echo $testscriptcontent | grep cpvirtualenvtest"
+    assertTrue virtualenvwrapper_verify_active_environment
+    assertSame "cpvirtualenvcopy" $(basename "$VIRTUAL_ENV")
+    cdvirtualenv
+    assertSame "$VIRTUAL_ENV" "$(pwd)"
+}
+
+test_cprelocatablevirtualenv () {
+    mkvirtualenv "cprelocatabletest"
+    virtualenv --relocatable "$WORKON_HOME/cprelocatabletest"
+    cpvirtualenv "cprelocatabletest" "cprelocatablecopy"
+    assertTrue virtualenvwrapper_verify_active_environment
+    assertSame "cprelocatablecopy" $(basename "$VIRTUAL_ENV")
+    cdvirtualenv
+    assertSame "$VIRTUAL_ENV" "$(pwd)"
+}
+
+
+. "$test_dir/shunit2"
+