status-im/torrent
2
0
Fork 0
mirror of synced 2025-02-24 14:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up TestMultipleTorrentsWithEncryption test

Browse Source
This commit is contained in:
Matt Joiner 2016-09-21 21:02:18 +10:00
parent 7856cc6329
commit 0c9c3d35cf
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client_test.go
View File

@ -10,6 +10,7 @@ import (
"math/rand" "math/rand"
"net" "net"
"os" "os"
"path/filepath"
"strings" "strings"
"sync" "sync"
"testing" "testing"
@ -1025,15 +1026,14 @@ func TestSetMaxEstablishedConn(t *testing.T) {
} }
func makeMagnet(t *testing.T, cl *Client, dir string, name string) string { func makeMagnet(t *testing.T, cl *Client, dir string, name string) string {
var err error file, err := os.Create(filepath.Join(dir, name))
file, err := os.Create(dir + "/" + name)
require.NoError(t, err) require.NoError(t, err)
file.Write([]byte(name)) file.Write([]byte(name))
file.Close() file.Close()
mi := metainfo.MetaInfo{} mi := metainfo.MetaInfo{}
mi.SetDefaults() mi.SetDefaults()
info := metainfo.Info{PieceLength: 256 * 1024} info := metainfo.Info{PieceLength: 256 * 1024}
err = info.BuildFromFilePath(dir + "/" + name) err = info.BuildFromFilePath(filepath.Join(dir, name))
require.NoError(t, err) require.NoError(t, err)
mi.InfoBytes, err = bencode.Marshal(info) mi.InfoBytes, err = bencode.Marshal(info)
require.NoError(t, err) require.NoError(t, err)
@ -1049,23 +1049,25 @@ func TestMultipleTorrentsWithEncryption(t *testing.T) {
cfg := TestingConfig cfg := TestingConfig
cfg.DisableUTP = true cfg.DisableUTP = true
cfg.Seed = true cfg.Seed = true
cfg.DataDir = cfg.DataDir + "/server" cfg.DataDir = filepath.Join(cfg.DataDir, "server")
cfg.Debug = true cfg.Debug = true
cfg.ForceEncryption = true cfg.ForceEncryption = true
os.Mkdir(cfg.DataDir, 0755) os.Mkdir(cfg.DataDir, 0755)
server, err := NewClient(&cfg) server, err := NewClient(&cfg)
defer server.Close()
require.NoError(t, err) require.NoError(t, err)
defer server.Close()
testutil.ExportStatusWriter(server, "s")
magnet1 := makeMagnet(t, server, cfg.DataDir, "test1") magnet1 := makeMagnet(t, server, cfg.DataDir, "test1")
makeMagnet(t, server, cfg.DataDir, "test2") makeMagnet(t, server, cfg.DataDir, "test2")
cfg = TestingConfig cfg = TestingConfig
cfg.DisableUTP = true cfg.DisableUTP = true
cfg.DataDir = cfg.DataDir + "/client" cfg.DataDir = filepath.Join(cfg.DataDir, "client")
cfg.Debug = true cfg.Debug = true
cfg.ForceEncryption = true cfg.ForceEncryption = true
client, err := NewClient(&cfg) client, err := NewClient(&cfg)
require.NoError(t, err) require.NoError(t, err)
defer client.Close() defer client.Close()
testutil.ExportStatusWriter(client, "c")
tr, err := client.AddMagnet(magnet1) tr, err := client.AddMagnet(magnet1)
require.NoError(t, err) require.NoError(t, err)
tr.AddPeers([]Peer{Peer{ tr.AddPeers([]Peer{Peer{