Remove duplicate config sample in testdata.

dearplain · Mar 15, 2013 · 3b6692b · 3b6692b
1 parent 376e59b
commit 3b6692b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/config.json b/config.json
@@ -3,5 +3,5 @@
     "server_port":8388,
     "local_port":1080,
     "password":"barfoo!",
-    "timeout":0
+    "timeout":600
 }
diff --git a/shadowsocks/config_test.go b/shadowsocks/config_test.go
@@ -23,7 +23,7 @@ func TestConfigJson(t *testing.T) {
 }
 
 func TestServerMultiPort(t *testing.T) {
-	config, err := ParseConfig("testdata/server-multi-port.json")
+	config, err := ParseConfig("../sample-config/server-multi-port.json")
 	if err != nil {
 		t.Fatal("error parsing multi server-multi-port.json:", err)
 	}
@@ -59,7 +59,7 @@ func TestDeprecatedClientMultiServerArray(t *testing.T) {
 }
 
 func TestClientMultiServerArray(t *testing.T) {
-	config, err := ParseConfig("testdata/client-multi-server.json")
+	config, err := ParseConfig("../sample-config/client-multi-server.json")
 	if err != nil {
 		t.Fatal("error parsing client-multi-server.json:", err)
 	}

diff --git a/shadowsocks/testdata/client-multi-server.json b/shadowsocks/testdata/client-multi-server.json
diff --git a/shadowsocks/testdata/server-multi-port.json b/shadowsocks/testdata/server-multi-port.json