roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

p2p: remove testlog

Browse Source
This commit is contained in:
Felix Lange 2015-05-14 14:56:34 +02:00
parent 7fa2607bd1
commit 206fe25971
3 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
p2p/peer_test.go
View File

@ -50,8 +50,6 @@ func testPeer(protos []Protocol) (func(), *conn, *Peer, <-chan DiscReason) {
} }
func TestPeerProtoReadMsg(t *testing.T) { func TestPeerProtoReadMsg(t *testing.T) {
defer testlog(t).detach()
done := make(chan struct{}) done := make(chan struct{})
proto := Protocol{ proto := Protocol{
Name: "a", Name: "a",
@ -88,8 +86,6 @@ func TestPeerProtoReadMsg(t *testing.T) {
} }
func TestPeerProtoEncodeMsg(t *testing.T) { func TestPeerProtoEncodeMsg(t *testing.T) {
defer testlog(t).detach()
proto := Protocol{ proto := Protocol{
Name: "a", Name: "a",
Length: 2, Length: 2,
@ -112,8 +108,6 @@ func TestPeerProtoEncodeMsg(t *testing.T) {
} }
func TestPeerWriteForBroadcast(t *testing.T) { func TestPeerWriteForBroadcast(t *testing.T) {
defer testlog(t).detach()
closer, rw, peer, peerErr := testPeer([]Protocol{discard}) closer, rw, peer, peerErr := testPeer([]Protocol{discard})
defer closer() defer closer()
@ -152,8 +146,6 @@ func TestPeerWriteForBroadcast(t *testing.T) {
} }
func TestPeerPing(t *testing.T) { func TestPeerPing(t *testing.T) {
defer testlog(t).detach()
closer, rw, _, _ := testPeer(nil) closer, rw, _, _ := testPeer(nil)
defer closer() defer closer()
if err := SendItems(rw, pingMsg); err != nil { if err := SendItems(rw, pingMsg); err != nil {
@ -165,8 +157,6 @@ func TestPeerPing(t *testing.T) {
} }
func TestPeerDisconnect(t *testing.T) { func TestPeerDisconnect(t *testing.T) {
defer testlog(t).detach()
closer, rw, _, disc := testPeer(nil) closer, rw, _, disc := testPeer(nil)
defer closer() defer closer()
if err := SendItems(rw, discMsg, DiscQuitting); err != nil { if err := SendItems(rw, discMsg, DiscQuitting); err != nil {
@ -185,7 +175,6 @@ func TestPeerDisconnect(t *testing.T) {
// This test is supposed to verify that Peer can reliably handle // This test is supposed to verify that Peer can reliably handle
// multiple causes of disconnection occurring at the same time. // multiple causes of disconnection occurring at the same time.
func TestPeerDisconnectRace(t *testing.T) { func TestPeerDisconnectRace(t *testing.T) {
defer testlog(t).detach()
maybe := func() bool { return rand.Intn(1) == 1 } maybe := func() bool { return rand.Intn(1) == 1 }
for i := 0; i < 1000; i++ { for i := 0; i < 1000; i++ {

15
p2p/server_test.go
View File

@ -46,8 +46,6 @@ func startTestServer(t *testing.T, pf newPeerHook) *Server {
} }
func TestServerListen(t *testing.T) { func TestServerListen(t *testing.T) {
defer testlog(t).detach()
// start the test server // start the test server
connected := make(chan *Peer) connected := make(chan *Peer)
srv := startTestServer(t, func(p *Peer) { srv := startTestServer(t, func(p *Peer) {
@ -78,8 +76,6 @@ func TestServerListen(t *testing.T) {
} }
func TestServerDial(t *testing.T) { func TestServerDial(t *testing.T) {
defer testlog(t).detach()
// run a one-shot TCP server to handle the connection. // run a one-shot TCP server to handle the connection.
listener, err := net.Listen("tcp", "127.0.0.1:0") listener, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil { if err != nil {
@ -126,8 +122,6 @@ func TestServerDial(t *testing.T) {
} }
func TestServerBroadcast(t *testing.T) { func TestServerBroadcast(t *testing.T) {
defer testlog(t).detach()
var connected sync.WaitGroup var connected sync.WaitGroup
srv := startTestServer(t, func(p *Peer) { srv := startTestServer(t, func(p *Peer) {
p.running = matchProtocols([]Protocol{discard}, []Cap{discard.cap()}, p.rw) p.running = matchProtocols([]Protocol{discard}, []Cap{discard.cap()}, p.rw)
@ -172,8 +166,6 @@ func TestServerBroadcast(t *testing.T) {
// //
// It also serves as a light-weight integration test. // It also serves as a light-weight integration test.
func TestServerDisconnectAtCap(t *testing.T) { func TestServerDisconnectAtCap(t *testing.T) {
defer testlog(t).detach()
started := make(chan *Peer) started := make(chan *Peer)
srv := &Server{ srv := &Server{
ListenAddr: "127.0.0.1:0", ListenAddr: "127.0.0.1:0",
@ -224,8 +216,6 @@ func TestServerDisconnectAtCap(t *testing.T) {
// Tests that static peers are (re)connected, and done so even above max peers. // Tests that static peers are (re)connected, and done so even above max peers.
func TestServerStaticPeers(t *testing.T) { func TestServerStaticPeers(t *testing.T) {
defer testlog(t).detach()
// Create a test server with limited connection slots // Create a test server with limited connection slots
started := make(chan *Peer) started := make(chan *Peer)
server := &Server{ server := &Server{
@ -312,7 +302,6 @@ func TestServerStaticPeers(t *testing.T) {
// Tests that trusted peers and can connect above max peer caps. // Tests that trusted peers and can connect above max peer caps.
func TestServerTrustedPeers(t *testing.T) { func TestServerTrustedPeers(t *testing.T) {
defer testlog(t).detach()
// Create a trusted peer to accept connections from // Create a trusted peer to accept connections from
key := newkey() key := newkey()
@ -374,8 +363,6 @@ func TestServerTrustedPeers(t *testing.T) {
// Tests that a failed dial will temporarily throttle a peer. // Tests that a failed dial will temporarily throttle a peer.
func TestServerMaxPendingDials(t *testing.T) { func TestServerMaxPendingDials(t *testing.T) {
defer testlog(t).detach()
// Start a simple test server // Start a simple test server
server := &Server{ server := &Server{
ListenAddr: "127.0.0.1:0", ListenAddr: "127.0.0.1:0",
@ -443,8 +430,6 @@ func TestServerMaxPendingDials(t *testing.T) {
} }
func TestServerMaxPendingAccepts(t *testing.T) { func TestServerMaxPendingAccepts(t *testing.T) {
defer testlog(t).detach()
// Start a test server and a peer sink for synchronization // Start a test server and a peer sink for synchronization
started := make(chan *Peer) started := make(chan *Peer)
server := &Server{ server := &Server{

25
p2p/testlog_test.go
View File

@ -1,25 +0,0 @@
package p2p
import (
"testing"
"github.com/ethereum/go-ethereum/logger"
)
type testLogger struct{ t *testing.T }
func testlog(t *testing.T) testLogger {
logger.Reset()
l := testLogger{t}
logger.AddLogSystem(l)
return l
}
func (l testLogger) LogPrint(msg logger.LogMsg) {
l.t.Logf("%s", msg.String())
}
func (testLogger) detach() {
logger.Flush()
logger.Reset()
}