Merge pull request #72 from vmarkovtsev/master

Small CI and code improvements

appveyor.yml

@@ -8,7 +8,7 @@ environment:
   GOPATH: c:\gopath
 
 install:
-  - choco install --allow-empty-checksums make
+  - appveyor-retry choco install --allow-empty-checksums make
   - c:\msys64\usr\bin\pacman --noconfirm --needed -S mingw-w64-x86_64-toolchain
   - curl -SLko protoc.zip https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-win32.zip
   - 7z e protoc.zip
@@ -22,6 +22,10 @@ build_script:
   - make
   - 7z a c:\gopath\src\gopkg.in\src-d\hercules.v3\hercules.win64.zip %GOPATH%\bin\hercules.exe
 
+test_script:
+  - go get -v -t -d gopkg.in/src-d/hercules.v3/...
+  - go test -v -tags disable_babelfish gopkg.in/src-d/hercules.v3
+
 artifacts:
   - name: hercules.win64.zip
     path: hercules.win64.zip

changes_xpather.go

@@ -1,14 +1,14 @@
 package hercules
 
 import (
+	"bytes"
 	"log"
+	"io"
 
-	"bytes"
 	"github.com/minio/highwayhash"
 	"gopkg.in/bblfsh/client-go.v2/tools"
 	"gopkg.in/bblfsh/sdk.v1/uast"
 	"gopkg.in/src-d/go-git.v4/plumbing"
-	"io"
 )
 
 // ChangesXPather extracts changed UAST nodes from files changed in the current commit.

changes_xpather_test.go

@@ -1,3 +1,5 @@
+// +build !disable_babelfish
+
 package hercules
 
 import (

comment_sentiment_test.go

@@ -1,3 +1,5 @@
+// +build tensorflow
+
 package hercules
 
 import (

uast_test.go

@@ -1,3 +1,5 @@
+// +build !disable_babelfish
+
 package hercules
 
 import (
@@ -7,13 +9,14 @@ import (
 	"testing"
 
 	"fmt"
+	"path"
+
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"gopkg.in/bblfsh/sdk.v1/uast"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"
 	"gopkg.in/src-d/hercules.v3/pb"
-	"path"
 )
 
 func fixtureUASTExtractor() *UASTExtractor {