Split src tree python use to config/bin/python and dev/bup-python

[bup.git] / t / test-web.sh

diff --git a/t/test-web.sh b/t/test-web.sh
index 45eac5e042479d19c2f6265a8467c85a01835e84..24a68a4109c97fc2a9701908d03f99831ec440fd 100755 (executable)
--- a/t/test-web.sh
+++ b/t/test-web.sh
@@ -28,38 +28,45 @@ wait-for-server-start()
 WVPASS cd "$tmpdir"
 
 # FIXME: add WVSKIP
-run_test=true
-
 if test -z "$(type -p curl)"; then
     WVSTART 'curl does not appear to be installed; skipping  test'
-    run_test=''
+    exit 0
 fi
     
-WVPASS bup-python -c "import socket as s; s.socket(s.AF_UNIX).bind('socket')"
-curl --unix-socket ./socket http://localhost/foo
+WVPASS bup-cfg-py -c "import socket as s; s.socket(s.AF_UNIX).bind('socket')"
+curl -s --unix-socket ./socket http://localhost/foo
 if test $? -ne 7; then
     WVSTART 'curl does not appear to support --unix-socket; skipping test'
-    run_test=''
+    exit 0
+fi
+
+if ! bup-python -c 'import tornado' 2> /dev/null; then
+    WVSTART 'unable to import tornado; skipping test'
+    exit 0
 fi
-    
-if test -n "$run_test"; then
-    WVSTART 'web'
-    WVPASS bup init
-    WVPASS mkdir src
-    WVPASS echo '¡excitement!' > src/data
-    WVPASS bup index src
-    WVPASS bup save -n '¡excitement!' --strip src
 
-    "$TOP/bup" web unix://socket &
-    web_pid=$!
-    wait-for-server-start
+WVSTART 'web'
+WVPASS bup init
+WVPASS mkdir src
+WVPASS echo '¡excitement!' > src/data
+WVPASS echo -e 'whee \x80\x90\xff' > "$(echo -ne 'src/whee \x80\x90\xff')"
+WVPASS bup index src
+WVPASS bup save -n '¡excitement!' --strip src
 
-    WVPASS curl --unix-socket ./socket \
-           'http://localhost/%C2%A1excitement%21/latest/data' > result
+"$TOP/bup" web unix://socket &
+web_pid=$!
+wait-for-server-start
 
-    WVPASSEQ '¡excitement!' "$(cat result)"
-    WVPASS kill -s TERM "$web_pid"
-    WVPASS wait "$web_pid"
-fi
+WVPASS curl --unix-socket ./socket \
+       'http://localhost/%C2%A1excitement%21/latest/data' > result
+WVPASS curl --unix-socket ./socket \
+       'http://localhost/%C2%A1excitement%21/latest/whee%20%80%90%ff' > result2
+WVPASSEQ "$(curl --unix-socket ./socket http://localhost/static/styles.css)" \
+         "$(cat "$TOP/lib/web/static/styles.css")"
+
+WVPASSEQ '¡excitement!' "$(cat result)"
+WVPASS cmp "$(echo -ne 'src/whee \x80\x90\xff')" result2
+WVPASS kill -s TERM "$web_pid"
+WVPASS wait "$web_pid"
 
 WVPASS rm -r "$tmpdir"