Merge pull request #2087 from rogers0/PR/fix_tests

Update config under tests/ folder

tests/aes-ctr.json

@@ -5,6 +5,6 @@
     "password":"aes_password",
     "timeout":60,
     "method":"aes-256-ctr",
-    "local_address":"127.0.0.1",
+    "local":"127.0.0.1",
     "fast_open":false
 }

tests/aes-gcm.json

@@ -5,6 +5,6 @@
     "password":"aes_password",
     "timeout":60,
     "method":"aes-256-gcm",
-    "local_address":"127.0.0.1",
+    "local":"127.0.0.1",
     "fast_open":false
 }

tests/aes.json

@@ -5,6 +5,6 @@
     "password":"aes_password",
     "timeout":60,
     "method":"aes-256-cfb",
-    "local_address":"127.0.0.1",
+    "local":"127.0.0.1",
     "fast_open":false
 }

tests/chacha20-ietf-poly1305.json

@@ -5,6 +5,6 @@
     "password":"salsa20_password",
     "timeout":60,
     "method":"chacha20-ietf-poly1305",
-    "local_address":"127.0.0.1",
+    "local":"127.0.0.1",
     "fast_open":false
 }

tests/chacha20-ietf.json

@@ -5,6 +5,6 @@
     "password":"salsa20_password",
     "timeout":60,
     "method":"chacha20-ietf",
-    "local_address":"127.0.0.1",
+    "local":"127.0.0.1",
     "fast_open":false
 }

tests/chacha20.json

@@ -5,6 +5,6 @@
     "password":"chacha20_password",
     "timeout":60,
     "method":"chacha20",
-    "local_address":"127.0.0.1",
+    "local":"127.0.0.1",
     "fast_open":false
 }

tests/rc4-md5.json

@@ -5,6 +5,6 @@
     "password":"aes_password",
     "timeout":60,
     "method":"rc4-md5",
-    "local_address":"127.0.0.1",
+    "local":"127.0.0.1",
     "fast_open":false
 }

tests/salsa20.json

@@ -5,6 +5,6 @@
     "password":"salsa20_password",
     "timeout":60,
     "method":"salsa20",
-    "local_address":"127.0.0.1",
+    "local":"127.0.0.1",
     "fast_open":false
 }

tests/test.sh

@@ -27,6 +27,11 @@ function run_test {
 [ -d src -a -x src/ss-local ] &&
     BIN="--bin src/"
 
+if [ "$http_proxy" ]; then
+    echo "SKIP: shadowsocks-libev does not support an upstream HTTP proxy"
+    exit 0
+fi
+
 run_test python tests/test.py $BIN -c tests/aes.json
 run_test python tests/test.py $BIN -c tests/aes-gcm.json
 run_test python tests/test.py $BIN -c tests/aes-ctr.json