diff options
| author | Janoš Guljaš <janos@users.noreply.github.com> | 2018-08-06 17:33:22 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-08-06 17:33:22 +0800 |
| commit | a72ba5a55be3abb1be85126838ee0b4a9c475be4 (patch) | |
| tree | 6c02c730ded55f6842778618ba06ae3d52d06bdf /cmd/swarm | |
| parent | 6711f098d5f070fbb26a4dd7899e3c6c766f4477 (diff) | |
| download | go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.tar.gz go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.tar.zst go-tangerine-a72ba5a55be3abb1be85126838ee0b4a9c475be4.zip | |
cmd/swarm, swarm: various test fixes (#17299)
* swarm/network/simulation: increase the sleep duration for TestRun
* cmd/swarm, swarm: fix failing tests on mac
* cmd/swarm: update TestCLISwarmFs skip comment
* swarm/network/simulation: adjust disconnections on simulation close
* swarm/network/simulation: call cleanups after net shutdown
Diffstat (limited to 'cmd/swarm')
| -rw-r--r-- | cmd/swarm/fs.go | 2 | ||||
| -rw-r--r-- | cmd/swarm/fs_test.go | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cmd/swarm/fs.go b/cmd/swarm/fs.go index 0124586cf..3dc38ca4d 100644 --- a/cmd/swarm/fs.go +++ b/cmd/swarm/fs.go @@ -92,7 +92,7 @@ func listMounts(cliContext *cli.Context) { mf := []fuse.MountInfo{} err = client.CallContext(ctx, &mf, "swarmfs_listmounts") if err != nil { - utils.Fatalf("encountered an error calling the RPC endpoint while unmounting: %v", err) + utils.Fatalf("encountered an error calling the RPC endpoint while listing mounts: %v", err) } if len(mf) == 0 { fmt.Print("Could not found any swarmfs mounts. Please make sure you've specified the correct RPC endpoint\n") diff --git a/cmd/swarm/fs_test.go b/cmd/swarm/fs_test.go index 0cbf0eb13..a2b730bd5 100644 --- a/cmd/swarm/fs_test.go +++ b/cmd/swarm/fs_test.go @@ -44,6 +44,11 @@ type testFile struct { // TestCLISwarmFs is a high-level test of swarmfs func TestCLISwarmFs(t *testing.T) { + // This test fails on travis as this executable exits with code 1 + // and without any log messages in the log. + // /Library/Filesystems/osxfuse.fs/Contents/Resources/load_osxfuse + t.Skip() + cluster := newTestCluster(t, 3) defer cluster.Shutdown() |