move tests and remove config.json

mifaa · Jul 12, 2014 · 68b9a06 · 68b9a06
1 parent 0df13b5
commit 68b9a06
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,10 +12,10 @@ before_install:
   - pip install m2crypto salsa20
   - sudo tests/socksify/install.sh
 script:
-  - python test.py -c tests/table.json
-  - python test.py -c tests/aes.json
-  - python test.py -c tests/salsa20.json
-  - python test.py -c tests/server-multi-ports.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
+  - python tests/test.py -c tests/table.json
+  - python tests/test.py -c tests/aes.json
+  - python tests/test.py -c tests/salsa20.json
+  - python tests/test.py -c tests/server-multi-ports.json
+  - python tests/test.py -c tests/server-multi-passwd.json
+  - python tests/test.py -c tests/server-multi-passwd-table.json
+  - python tests/test.py -c tests/workers.json
diff --git a/config.json b/config.json
diff --git a/test.py → tests/test.py b/test.py → tests/test.py
@@ -8,6 +8,8 @@
 import time
 from subprocess import Popen, PIPE
 
+sys.path.insert(0, '../')
+
 if 'salsa20' in sys.argv[-1]:
     from shadowsocks import encrypt_salsa20
     encrypt_salsa20.test()

diff --git a/test_latency.py → tests/test_latency.py b/test_latency.py → tests/test_latency.py