aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorLewis Marshall <lewis@lmars.net>2017-07-31 21:58:19 +0800
committerFelix Lange <fjl@users.noreply.github.com>2017-07-31 21:58:19 +0800
commit60c858a5291da6757ca6798178f4e67f77dd4122 (patch)
tree817e7f5013e0059ec07852c73a61c91dfcf6881e /cmd
parente9b850805eebc55ea8486323a1a7861b9b554430 (diff)
downloaddexon-60c858a5291da6757ca6798178f4e67f77dd4122.tar
dexon-60c858a5291da6757ca6798178f4e67f77dd4122.tar.gz
dexon-60c858a5291da6757ca6798178f4e67f77dd4122.tar.bz2
dexon-60c858a5291da6757ca6798178f4e67f77dd4122.tar.lz
dexon-60c858a5291da6757ca6798178f4e67f77dd4122.tar.xz
dexon-60c858a5291da6757ca6798178f4e67f77dd4122.tar.zst
dexon-60c858a5291da6757ca6798178f4e67f77dd4122.zip
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.
Diffstat (limited to 'cmd')
-rw-r--r--cmd/swarm/run_test.go1
-rw-r--r--cmd/swarm/upload_test.go2
2 files changed, 1 insertions, 2 deletions
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)