From 60c858a5291da6757ca6798178f4e67f77dd4122 Mon Sep 17 00:00:00 2001 From: Lewis Marshall Date: Mon, 31 Jul 2017 14:58:19 +0100 Subject: swarm/api: make api.NewManifest synchronous (#14880) Previously, NewManifest was asynchronous so subsequent code which tried to use the returned manifest could error as the manifest was not yet persisted. --- cmd/swarm/run_test.go | 1 + cmd/swarm/upload_test.go | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'cmd/swarm') diff --git a/cmd/swarm/run_test.go b/cmd/swarm/run_test.go index 05cbb27f1..aaaf9e1e5 100644 --- a/cmd/swarm/run_test.go +++ b/cmd/swarm/run_test.go @@ -161,6 +161,7 @@ func newTestNode(t *testing.T, dir string) *testNode { conf := &node.Config{ DataDir: dir, IPCPath: "bzzd.ipc", + NoUSB: true, } n, err := node.New(conf) if err != nil { diff --git a/cmd/swarm/upload_test.go b/cmd/swarm/upload_test.go index 5b74dd4f1..5656186e1 100644 --- a/cmd/swarm/upload_test.go +++ b/cmd/swarm/upload_test.go @@ -27,8 +27,6 @@ import ( // TestCLISwarmUp tests that running 'swarm up' makes the resulting file // available from all nodes via the HTTP API func TestCLISwarmUp(t *testing.T) { - t.Skip("flaky test") - // start 3 node cluster t.Log("starting 3 node cluster") cluster := newTestCluster(t, 3) -- cgit v1.2.3