diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-14 17:35:49 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-14 17:36:12 +0800 |
| commit | 47a801455966298d1d1519eebb955024c8f02b84 (patch) | |
| tree | 5b8144ba4844092dc0bae599fc3314eaacf1a7b4 /swarm/fuse/swarmfs_test.go | |
| parent | 19982f946735948478b6b7e7706f1b615f171d0d (diff) | |
| parent | 3654aeaa4f87452ac5bc801a18808189595e2ef8 (diff) | |
| download | dexon-47a801455966298d1d1519eebb955024c8f02b84.tar dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.gz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.bz2 dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.lz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.xz dexon-47a801455966298d1d1519eebb955024c8f02b84.tar.zst dexon-47a801455966298d1d1519eebb955024c8f02b84.zip | |
cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Fix a conflict in cmd/swarm envVarsOverride function.
Diffstat (limited to 'swarm/fuse/swarmfs_test.go')
| -rw-r--r-- | swarm/fuse/swarmfs_test.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/swarm/fuse/swarmfs_test.go b/swarm/fuse/swarmfs_test.go index 93f1d4c2f..42af36345 100644 --- a/swarm/fuse/swarmfs_test.go +++ b/swarm/fuse/swarmfs_test.go @@ -95,7 +95,7 @@ func mountDir(t *testing.T, api *api.Api, files map[string]fileInfo, bzzHash str } // Test listMounts - if found == false { + if !found { t.Fatalf("Error getting mounts information for %v: %v", mountDir, err) } @@ -185,10 +185,8 @@ func isDirEmpty(name string) bool { defer f.Close() _, err = f.Readdirnames(1) - if err == io.EOF { - return true - } - return false + + return err == io.EOF } type testAPI struct { @@ -388,7 +386,7 @@ func (ta *testAPI) seekInMultiChunkFile(t *testing.T) { d.Read(contents) finfo := files["1.txt"] - if bytes.Compare(finfo.contents[:6024][5000:], contents) != 0 { + if !bytes.Equal(finfo.contents[:6024][5000:], contents) { t.Fatalf("File seek contents mismatch") } d.Close() |