Fix slow tests and improve test output (colorized) #58

Makefile

@@ -27,11 +27,11 @@ start:
 migrate:
 	go run cmd/photoprism/photoprism.go migrate
 test:
-	go test -tags=slow -timeout 20m -v ./internal/...
+	go test -tags=slow -timeout 20m -v ./internal/... | scripts/colorize-tests.sh
 test-fast:
-	go test -timeout 5m -v ./internal/...
+	go test -timeout 5m -v ./internal/... | scripts/colorize-tests.sh
 test-race:
-	go test -tags=slow -race -timeout 60m -v ./internal/...
+	go test -tags=slow -race -timeout 60m -v ./internal/... | scripts/colorize-tests.sh
 test-codecov:
 	go test -tags=slow -timeout 30m -coverprofile=coverage.txt -covermode=atomic -v ./internal/...
 	scripts/codecov.sh

internal/fsutil/file.go

@@ -12,13 +12,14 @@ import (
 	"strings"
 )
 
+// Returns true if file exists
 func Exists(filename string) bool {
 	info, err := os.Stat(filename)
 
 	return err == nil && !info.IsDir()
 }
 
-// Returns the expanded format for a filename.
+// Returns full path; ~ replaced with actual home directory
 func ExpandedFilename(filename string) string {
 	usr, _ := user.Current()
 	dir := usr.HomeDir
@@ -36,7 +37,7 @@ func ExpandedFilename(filename string) string {
 	return result
 }
 
-
+// Extract Zip file in destination directory
 func Unzip(src, dest string) ([]string, error) {
 
 	var fileNames []string
@@ -103,6 +104,7 @@ func Unzip(src, dest string) ([]string, error) {
 	return fileNames, nil
 }
 
+// Download a file from a URL
 func Download(filepath string, url string) (err error) {
 	os.MkdirAll("/tmp/photoprism", os.ModePerm)
 

internal/fsutil/hash.go

@@ -7,6 +7,7 @@ import (
 	"os"
 )
 
+// Returns sha1 hash of file as string
 func Hash(filename string) string {
 	var result []byte
 
@@ -25,4 +26,4 @@ func Hash(filename string) string {
 	}
 
 	return hex.EncodeToString(hash.Sum(result))
-}
+}

internal/photoprism/colors_slow_test.go

@@ -5,6 +5,7 @@ package photoprism
 import (
 	"testing"
 
+	"github.com/photoprism/photoprism/internal/test"
 	"github.com/stretchr/testify/assert"
 )
 

internal/photoprism/config.go

@@ -38,4 +38,3 @@ type Config interface {
 	GetPublicPath() string
 	GetPublicBuildPath() string
 }
-

internal/photoprism/converter_slow_test.go

@@ -6,6 +6,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/photoprism/photoprism/internal/fsutil"
+	"github.com/photoprism/photoprism/internal/test"
 	"github.com/stretchr/testify/assert"
 )
 

internal/photoprism/converter_test.go

@@ -13,4 +13,4 @@ func TestNewConverter(t *testing.T) {
 	converter := NewConverter(conf.GetDarktableCli())
 
 	assert.IsType(t, &Converter{}, converter)
-}
+}

internal/photoprism/exif_slow_test.go

@@ -5,6 +5,7 @@ package photoprism
 import (
 	"testing"
 
+	"github.com/photoprism/photoprism/internal/test"
 	"github.com/stretchr/testify/assert"
 )
 

internal/photoprism/file_check.go

@@ -1,2 +0,0 @@
-package photoprism
-

internal/photoprism/importer_slow_test.go

@@ -4,6 +4,8 @@ package photoprism
 
 import (
 	"testing"
+
+	"github.com/photoprism/photoprism/internal/test"
 )
 
 func TestImporter_ImportPhotosFromDirectory(t *testing.T) {
@@ -20,4 +22,4 @@ func TestImporter_ImportPhotosFromDirectory(t *testing.T) {
 	importer := NewImporter(conf.GetOriginalsPath(), indexer, converter)
 
 	importer.ImportPhotosFromDirectory(conf.GetImportPath())
-}
+}

internal/photoprism/mediafile_slow_test.go

@@ -5,6 +5,7 @@ package photoprism
 import (
 	"testing"
 
+	"github.com/photoprism/photoprism/internal/test"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -38,4 +39,4 @@ func TestMediaFile_GetPerceptiveHash_Slow(t *testing.T) {
 	distance, _ = mediaFile1.GetPerceptualDistance(hash3)
 
 	assert.Equal(t, 7, distance)
-}
+}

internal/photoprism/tensorflow_slow_test.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"testing"
 
+	"github.com/photoprism/photoprism/internal/test"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -31,4 +32,4 @@ func TestTensorFlow_GetImageTags(t *testing.T) {
 
 		assert.Equal(t, float32(0.1648176), result[1].Probability)
 	}
-}
+}

internal/photoprism/thumbnails_slow_test.go

@@ -4,6 +4,8 @@ package photoprism
 
 import (
 	"testing"
+
+	"github.com/photoprism/photoprism/internal/test"
 )
 
 func TestCreateThumbnailsFromOriginals(t *testing.T) {

internal/photoprism/thumbnails_test.go

@@ -39,4 +39,4 @@ func TestMediaFile_GetSquareThumbnail(t *testing.T) {
 	assert.Empty(t, err)
 
 	assert.IsType(t, &MediaFile{}, thumbnail1)
-}
+}

internal/test/config_test.go

@@ -22,4 +22,4 @@ func TestConfig_ConnectToDatabase(t *testing.T) {
 	db := c.GetDb()
 
 	assert.IsType(t, &gorm.DB{}, db)
-}
+}

scripts/colorize-tests.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+if (( $# == 0 )) ; then
+    sed ''/PASS/s//$(printf "\033[32mPASS\033[0m")/'' < /dev/stdin | sed ''/FAIL/s//$(printf "\033[31mFAIL\033[0m")/''
+else
+    sed ''/PASS/s//$(printf "\033[32mPASS\033[0m")/'' <<< "$1" | sed ''/FAIL/s//$(printf "\033[31mFAIL\033[0m")/''
+fi
+
+echo "Code that cannot be tested is flawed :-)"