Skip to content

Commit

Permalink
Fix go test.
Browse files Browse the repository at this point in the history
  • Loading branch information
cyfdecyf committed Aug 2, 2013
1 parent 9607c6b commit bf937b0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion sample-config/server-multi-port.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"8387": "foobar",
"8388": "barfoo"
},
"timeout": 600,
"timeout": 600
}
2 changes: 1 addition & 1 deletion shadowsocks/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestConfigJson(t *testing.T) {
func TestServerMultiPort(t *testing.T) {
config, err := ParseConfig("../sample-config/server-multi-port.json")
if err != nil {
t.Fatal("error parsing multi server-multi-port.json:", err)
t.Fatal("error parsing ../sample-config/server-multi-port.json:", err)
}

if config.PortPassword["8387"] != "foobar" {
Expand Down
12 changes: 6 additions & 6 deletions shadowsocks/encrypt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,30 +163,30 @@ func benchmarkCipherInit(b *testing.B, ci *cipherInfo) {

func BenchmarkAES128Init(b *testing.B) {
ci := cipherMethod["aes-128-cfb"]
benchmarkCipherInit(b, &ci)
benchmarkCipherInit(b, ci)
}

func BenchmarkAES192Init(b *testing.B) {
ci := cipherMethod["aes-192-cfb"]
benchmarkCipherInit(b, &ci)
benchmarkCipherInit(b, ci)
}

func BenchmarkAES256Init(b *testing.B) {
ci := cipherMethod["aes-256-cfb"]
benchmarkCipherInit(b, &ci)
benchmarkCipherInit(b, ci)
}

func BenchmarkBlowFishInit(b *testing.B) {
ci := cipherMethod["bf-cfb"]
benchmarkCipherInit(b, &ci)
benchmarkCipherInit(b, ci)
}

func BenchmarkCast5Init(b *testing.B) {
ci := cipherMethod["bf-cfb"]
benchmarkCipherInit(b, &ci)
benchmarkCipherInit(b, ci)
}

func BenchmarkDESInit(b *testing.B) {
ci := cipherMethod["des-cfb"]
benchmarkCipherInit(b, &ci)
benchmarkCipherInit(b, ci)
}

0 comments on commit bf937b0

Please sign in to comment.