Merge pull request #26 from RTradeLtd/pull/upstream

Pull In Upstream

Author: postables

add.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"io"
 	"os"
-	"path"
+	"path/filepath"
 
 	files "github.com/ipfs/go-ipfs-files"
 )
@@ -98,7 +98,7 @@ func (s *Shell) AddDir(dir string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	slf := files.NewSliceDirectory([]files.DirEntry{files.FileEntry(path.Base(dir), sf)})
+	slf := files.NewSliceDirectory([]files.DirEntry{files.FileEntry(filepath.Base(dir), sf)})
 	reader := files.NewMultiFileReader(slf, true)
 
 	resp, err := s.Request("add").

log.go renamed to logger.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 )
 
-func Test_Logger(t *testing.T) {
+func TestLogger(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	sh := NewShell(shellUrl)
@@ -18,8 +18,9 @@ func Test_Logger(t *testing.T) {
 			t.Fatal(err)
 		}
 	}()
-	_, err = logger.Next()
-	if err != nil {
+	if l, err := logger.Next(); err != nil {
 		t.Fatal(err)
+	} else if l == nil {
+		t.Fatal("no logs found")
 	}
 }