web: don't re-resolve item in listing

[bup.git] / t / test-ftp

diff --git a/t/test-ftp b/t/test-ftp
index e9f4166467b18e757d83f4c081a96ecd6c5bad22..a43824101ec09bf33681b8932f34b45091acb068 100755 (executable)
--- a/t/test-ftp
+++ b/t/test-ftp
@@ -1,6 +1,6 @@
 #!/bin/sh
 """": # -*-python-*-
-bup_python="$(dirname "$0")/../cmd/bup-python" || exit $?
+bup_python="$(dirname "$0")/../dev/bup-python" || exit $?
 exec "$bup_python" "$0" ${1+"$@"}
 """
 # end of bup preamble
@@ -14,6 +14,7 @@ import os, sys
 
 # For buptest, wvtest, ...
 sys.path[:0] = (abspath(os.path.dirname(__file__) + '/..'),)
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/../lib']
 
 from buptest import ex, exo, logcmd, test_tempdir
 from wvtest import wvfail, wvpass, wvpasseq, wvpassne, wvstart
@@ -63,7 +64,7 @@ with test_tempdir(b'ftp-') as tmpdir:
     
     wvstart('help')
     wvpasseq(b'Commands: ls cd pwd cat get mget help quit\n',
-             exo((bup_cmd, b'ftp'), input=b'help\n', stderr=PIPE).err)
+             exo((bup_cmd, b'ftp'), input=b'help\n', stderr=PIPE).out)
 
     wvstart('pwd/cd')
     wvpasseq(b'/\n', bup(b'ftp', input=b'pwd\n').out)