X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/30bfda443a98efc1a717f35258e3c3ffd7369d7c..9a02d4117bfc1372ce5b6baedc9303f2500b3197:/sdk/go/crunchrunner/upload_test.go

diff --git a/sdk/go/crunchrunner/upload_test.go b/sdk/go/crunchrunner/upload_test.go
index e337b76a53..5bc749258d 100644
--- a/sdk/go/crunchrunner/upload_test.go
+++ b/sdk/go/crunchrunner/upload_test.go
@@ -1,13 +1,18 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package main
 
 import (
 	"crypto/md5"
 	"errors"
 	"fmt"
-	. "gopkg.in/check.v1"
 	"io/ioutil"
-	"log"
 	"os"
+	"syscall"
+
+	. "gopkg.in/check.v1"
 )
 
 type UploadTestSuite struct{}
@@ -23,8 +28,6 @@ func (k KeepTestClient) PutHB(hash string, buf []byte) (string, int, error) {
 }
 
 func (s *TestSuite) TestSimpleUpload(c *C) {
-	log.Print("--TestSimpleUpload--")
-
 	tmpdir, _ := ioutil.TempDir("", "")
 	defer func() {
 		os.RemoveAll(tmpdir)
@@ -37,25 +40,27 @@ func (s *TestSuite) TestSimpleUpload(c *C) {
 	c.Check(str, Equals, ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:file1.txt\n")
 }
 
-func (s *TestSuite) TestSimpleUploadTwofiles(c *C) {
-	log.Print("--TestSimpleUploadTwofiles--")
-
+func (s *TestSuite) TestSimpleUploadThreeFiles(c *C) {
 	tmpdir, _ := ioutil.TempDir("", "")
 	defer func() {
 		os.RemoveAll(tmpdir)
 	}()
 
-	ioutil.WriteFile(tmpdir+"/"+"file1.txt", []byte("foo"), 0600)
-	ioutil.WriteFile(tmpdir+"/"+"file2.txt", []byte("bar"), 0600)
+	for _, err := range []error{
+		ioutil.WriteFile(tmpdir+"/"+"file1.txt", []byte("foo"), 0600),
+		ioutil.WriteFile(tmpdir+"/"+"file2.txt", []byte("bar"), 0600),
+		os.Symlink("./file2.txt", tmpdir+"/file3.txt"),
+		syscall.Mkfifo(tmpdir+"/ignore.fifo", 0600),
+	} {
+		c.Assert(err, IsNil)
+	}
 
 	str, err := WriteTree(KeepTestClient{}, tmpdir)
 	c.Check(err, IsNil)
-	c.Check(str, Equals, ". 3858f62230ac3c915f300c664312c63f+6 0:3:file1.txt 3:3:file2.txt\n")
+	c.Check(str, Equals, ". aa65a413921163458c52fea478d5d3ee+9 0:3:file1.txt 3:3:file2.txt 6:3:file3.txt\n")
 }
 
 func (s *TestSuite) TestSimpleUploadSubdir(c *C) {
-	log.Print("--TestSimpleUploadSubdir--")
-
 	tmpdir, _ := ioutil.TempDir("", "")
 	defer func() {
 		os.RemoveAll(tmpdir)
@@ -74,8 +79,6 @@ func (s *TestSuite) TestSimpleUploadSubdir(c *C) {
 }
 
 func (s *TestSuite) TestSimpleUploadLarge(c *C) {
-	log.Print("--TestSimpleUploadLarge--")
-
 	tmpdir, _ := ioutil.TempDir("", "")
 	defer func() {
 		os.RemoveAll(tmpdir)
@@ -83,7 +86,7 @@ func (s *TestSuite) TestSimpleUploadLarge(c *C) {
 
 	file, _ := os.Create(tmpdir + "/" + "file1.txt")
 	data := make([]byte, 1024*1024-1)
-	for i := 0; i < 1024*1024-1; i++ {
+	for i := range data {
 		data[i] = byte(i % 10)
 	}
 	for i := 0; i < 65; i++ {
@@ -99,8 +102,6 @@ func (s *TestSuite) TestSimpleUploadLarge(c *C) {
 }
 
 func (s *TestSuite) TestUploadEmptySubdir(c *C) {
-	log.Print("--TestUploadEmptySubdir--")
-
 	tmpdir, _ := ioutil.TempDir("", "")
 	defer func() {
 		os.RemoveAll(tmpdir)
@@ -117,8 +118,6 @@ func (s *TestSuite) TestUploadEmptySubdir(c *C) {
 }
 
 func (s *TestSuite) TestUploadEmptyFile(c *C) {
-	log.Print("--TestUploadEmptyFile--")
-
 	tmpdir, _ := ioutil.TempDir("", "")
 	defer func() {
 		os.RemoveAll(tmpdir)
@@ -140,8 +139,6 @@ func (k KeepErrorTestClient) PutHB(hash string, buf []byte) (string, int, error)
 }
 
 func (s *TestSuite) TestUploadError(c *C) {
-	log.Print("--TestSimpleUpload--")
-
 	tmpdir, _ := ioutil.TempDir("", "")
 	defer func() {
 		os.RemoveAll(tmpdir)