Skip to content

Commit

Permalink
Revert "swarm/pss: Hide big network tests under longrunning flag (eth…
Browse files Browse the repository at this point in the history
…ereum#17074)"

This reverts commit 1f0f6f0.
  • Loading branch information
nolash authored and hungnmq-ibl committed Jun 26, 2018
1 parent 6b13394 commit d417a41
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions swarm/pss/pss_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ var (
initOnce = sync.Once{}
debugdebugflag = flag.Bool("vv", false, "veryverbose")
debugflag = flag.Bool("v", false, "verbose")
longrunning = flag.Bool("longrunning", false, "do run long-running tests")
w *whisper.Whisper
wapi *whisper.PublicWhisperAPI
psslogmain log.Logger
Expand Down Expand Up @@ -950,19 +949,12 @@ func worker(id int, jobs <-chan Job, rpcs map[discover.NodeID]*rpc.Client, pubke
}
}

func TestNetwork(t *testing.T) {
t.Run("16/1000/4/sim", testNetwork)
}

// params in run name:
// nodes/msgs/addrbytes/adaptertype
// if adaptertype is exec uses execadapter, simadapter otherwise
func TestNetwork2000(t *testing.T) {
//enableMetrics()

if !*longrunning {
t.Skip("run with --longrunning flag to run extensive network tests")
}
t.Run("3/2000/4/sim", testNetwork)
t.Run("4/2000/4/sim", testNetwork)
t.Run("8/2000/4/sim", testNetwork)
Expand All @@ -972,9 +964,6 @@ func TestNetwork2000(t *testing.T) {
func TestNetwork5000(t *testing.T) {
//enableMetrics()

if !*longrunning {
t.Skip("run with --longrunning flag to run extensive network tests")
}
t.Run("3/5000/4/sim", testNetwork)
t.Run("4/5000/4/sim", testNetwork)
t.Run("8/5000/4/sim", testNetwork)
Expand All @@ -984,9 +973,6 @@ func TestNetwork5000(t *testing.T) {
func TestNetwork10000(t *testing.T) {
//enableMetrics()

if !*longrunning {
t.Skip("run with --longrunning flag to run extensive network tests")
}
t.Run("3/10000/4/sim", testNetwork)
t.Run("4/10000/4/sim", testNetwork)
t.Run("8/10000/4/sim", testNetwork)
Expand Down

0 comments on commit d417a41

Please sign in to comment.