From b50a89b1f531e897d9b893bbccac4e22fd1db0a8 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Thu, 5 Jun 2014 19:33:45 +0800 Subject: [PATCH] add server-multi-passwd-table test --- .travis.yml | 1 + tests/aes.json | 2 +- tests/fastopen.json | 2 +- tests/salsa20.json | 2 +- tests/server-multi-passwd-table.json | 19 +++++++++++++++++++ tests/table.json | 2 +- tests/workers.json | 2 +- 7 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 tests/server-multi-passwd-table.json diff --git a/.travis.yml b/.travis.yml index 81cfb2b..f9f7d7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,5 @@ script: - python test.py -c tests/aes.json - python test.py -c tests/salsa20.json - python test.py -c tests/server-multi-passwd.json + - python test.py -c tests/server-multi-passwd-table.json - python test.py -c tests/workers.json diff --git a/tests/aes.json b/tests/aes.json index cc9ffeb..7c0f8f2 100644 --- a/tests/aes.json +++ b/tests/aes.json @@ -3,7 +3,7 @@ "server_port":8388, "local_port":1081, "password":"barfoo!", - "timeout":300, + "timeout":60, "method":"aes-256-cfb", "local_address":"127.0.0.1", "fast_open":false diff --git a/tests/fastopen.json b/tests/fastopen.json index 4f3da05..82a9cb2 100644 --- a/tests/fastopen.json +++ b/tests/fastopen.json @@ -3,7 +3,7 @@ "server_port":8388, "local_port":1081, "password":"barfoo!", - "timeout":300, + "timeout":60, "method":"aes-256-cfb", "local_address":"127.0.0.1", "fast_open":true diff --git a/tests/salsa20.json b/tests/salsa20.json index 182589e..af1d266 100644 --- a/tests/salsa20.json +++ b/tests/salsa20.json @@ -3,7 +3,7 @@ "server_port":8388, "local_port":1081, "password":"barfoo!", - "timeout":300, + "timeout":60, "method":"salsa20-ctr", "local_address":"127.0.0.1", "fast_open":false diff --git a/tests/server-multi-passwd-table.json b/tests/server-multi-passwd-table.json new file mode 100644 index 0000000..a2c0a80 --- /dev/null +++ b/tests/server-multi-passwd-table.json @@ -0,0 +1,19 @@ +{ + "server": "127.0.0.1", + "server_port": 8384, + "local_port": 1081, + "password": "foobar4", + "port_password": { + "8381": "foobar1", + "8382": "foobar2", + "8383": "foobar3", + "8384": "foobar4", + "8385": "foobar5", + "8386": "foobar6", + "8387": "foobar7", + "8388": "foobar8", + "8389": "foobar9" + }, + "timeout": 60, + "method": "table" +} diff --git a/tests/table.json b/tests/table.json index 402a4b8..21cff86 100644 --- a/tests/table.json +++ b/tests/table.json @@ -3,7 +3,7 @@ "server_port":8388, "local_port":1081, "password":"barfoo!", - "timeout":300, + "timeout":60, "method":"table", "local_address":"127.0.0.1", "fast_open":false diff --git a/tests/workers.json b/tests/workers.json index 1df28ce..35f3962 100644 --- a/tests/workers.json +++ b/tests/workers.json @@ -3,7 +3,7 @@ "server_port":8388, "local_port":1081, "password":"barfoo!", - "timeout":300, + "timeout":60, "method":"aes-256-cfb", "local_address":"127.0.0.1", "workers": 4