From 5926f4f96c6625126c5808c7d0454f53c3d99b1e Mon Sep 17 00:00:00 2001
From: Pavol Loffay <ploffay@redhat.com>
Date: Tue, 20 Feb 2018 16:24:00 +0100
Subject: [PATCH] Fix lint

---
 .travis.yml                                          | 2 +-
 Makefile                                             | 2 +-
 examples/hotrod/services/frontend/bindata_assetfs.go | 3 +--
 scripts/import-order-cleanup.sh                      | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0ce2921f3c..57e904018b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,7 +53,7 @@ script:
   - if [ "$CROSSDOCK" == true ]; then bash ./scripts/travis/build-crossdock.sh ; else echo 'skipping crossdock'; fi
   - if [ "$DOCKER" == true ]; then bash ./scripts/travis/build-docker-images.sh ; else echo 'skipping docker images'; fi
   - if [ "$ES_INTEGRATION_TEST" == true ]; then bash ./scripts/travis/es-integration-test.sh ; else echo 'skipping elastic search integration test'; fi
-  - if [ "$HOTROD" == true ]; then bash ./scripts/travis/es-integration-test.sh ; else echo 'skipping hotrod example'; fi
+  - if [ "$HOTROD" == true ]; then bash ./scripts/travis/hotrod-integration-test.sh ; else echo 'skipping hotrod example'; fi
 
 after_success:
   - if [ "$COVERAGE" == true ]; then travis_retry goveralls -coverprofile=cover.out -service=travis-ci || true ; else echo 'skipping coverage'; fi
diff --git a/Makefile b/Makefile
index 48a23878fcf..efd11ccebde 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PROJECT_ROOT=github.com/jaegertracing/jaeger
 TOP_PKGS := $(shell glide novendor | grep -v -e ./thrift-gen/... -e swagger-gen... -e ./examples/... -e ./scripts/...)
 
 # all .go files that don't exist in hidden directories
-ALL_SRC := $(shell find . -name "*.go" | grep -v -e vendor -e thrift-gen -e swagger-gen -e examples -e doc.go \
+ALL_SRC := $(shell find . -name "*.go" | grep -v -e vendor -e thrift-gen -e swagger-gen -e examples -e doc.go -e bindata_assetfs.go \
         -e ".*/\..*" \
         -e ".*/_.*" \
         -e ".*/mocks.*")
diff --git a/examples/hotrod/services/frontend/bindata_assetfs.go b/examples/hotrod/services/frontend/bindata_assetfs.go
index d8d760e317e..0dec330013e 100644
--- a/examples/hotrod/services/frontend/bindata_assetfs.go
+++ b/examples/hotrod/services/frontend/bindata_assetfs.go
@@ -21,6 +21,7 @@
 package frontend
 
 import (
+	"github.com/elazarl/go-bindata-assetfs"
 	"bytes"
 	"compress/gzip"
 	"fmt"
@@ -30,8 +31,6 @@ import (
 	"path/filepath"
 	"strings"
 	"time"
-
-	"github.com/elazarl/go-bindata-assetfs"
 )
 
 func bindataRead(data []byte, name string) ([]byte, error) {
diff --git a/scripts/import-order-cleanup.sh b/scripts/import-order-cleanup.sh
index caceb1ca920..2299244c2f6 100755
--- a/scripts/import-order-cleanup.sh
+++ b/scripts/import-order-cleanup.sh
@@ -2,4 +2,4 @@
 
 set -e
 
-python scripts/import-order-cleanup.py -o $1 -t $(git ls-files "*\.go" | grep -v -e thrift-gen -e swagger-gen -e thrift-0.9.2)
+python scripts/import-order-cleanup.py -o $1 -t $(git ls-files "*\.go" | grep -v -e thrift-gen -e swagger-gen -e thrift-0.9.2 -e bindata_assetfs.go)