diff options
| author | Lewis Marshall <lewis@lmars.net> | 2017-06-21 20:54:23 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@users.noreply.github.com> | 2017-06-21 20:54:23 +0800 |
| commit | a1f3878ec50c8d9ce410d9715fa4c7ee998a3639 (patch) | |
| tree | 101d29006107167fdfef99f13b741eb9c3d082b7 /cmd/geth/dao_test.go | |
| parent | a20a02ce0bc4af67275eba418ff385f00bc87068 (diff) | |
| download | dexon-a1f3878ec50c8d9ce410d9715fa4c7ee998a3639.tar dexon-a1f3878ec50c8d9ce410d9715fa4c7ee998a3639.tar.gz dexon-a1f3878ec50c8d9ce410d9715fa4c7ee998a3639.tar.bz2 dexon-a1f3878ec50c8d9ce410d9715fa4c7ee998a3639.tar.lz dexon-a1f3878ec50c8d9ce410d9715fa4c7ee998a3639.tar.xz dexon-a1f3878ec50c8d9ce410d9715fa4c7ee998a3639.tar.zst dexon-a1f3878ec50c8d9ce410d9715fa4c7ee998a3639.zip | |
swarm/test: add integration test for 'swarm up' (#14353)
Diffstat (limited to 'cmd/geth/dao_test.go')
| -rw-r--r-- | cmd/geth/dao_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go index ec7802ada..8cc66aabf 100644 --- a/cmd/geth/dao_test.go +++ b/cmd/geth/dao_test.go @@ -112,12 +112,12 @@ func testDAOForkBlockNewChain(t *testing.T, test int, genesis string, expectBloc if err := ioutil.WriteFile(json, []byte(genesis), 0600); err != nil { t.Fatalf("test %d: failed to write genesis file: %v", test, err) } - runGeth(t, "--datadir", datadir, "init", json).cmd.Wait() + runGeth(t, "--datadir", datadir, "init", json).WaitExit() } else { // Force chain initialization args := []string{"--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--ipcdisable", "--datadir", datadir} geth := runGeth(t, append(args, []string{"--exec", "2+2", "console"}...)...) - geth.cmd.Wait() + geth.WaitExit() } // Retrieve the DAO config flag from the database path := filepath.Join(datadir, "geth", "chaindata") |