Merge branch '8784-dir-listings'

[arvados.git] / sdk / go / crunchrunner / upload_test.go

diff --git a/sdk/go/crunchrunner/upload_test.go b/sdk/go/crunchrunner/upload_test.go
index e337b76a53febe7daccb739bf2e1af67ba9615ac..ceb89dc26d767721ea65887a6789fcf8bb0d8983 100644 (file)
--- a/sdk/go/crunchrunner/upload_test.go
+++ b/sdk/go/crunchrunner/upload_test.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package main
 
 import (
@@ -6,7 +10,6 @@ import (
        "fmt"
        . "gopkg.in/check.v1"
        "io/ioutil"
-       "log"
        "os"
 )
 
@@ -23,8 +26,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)
@@ -38,8 +39,6 @@ func (s *TestSuite) TestSimpleUpload(c *C) {
 }
 
 func (s *TestSuite) TestSimpleUploadTwofiles(c *C) {
-       log.Print("--TestSimpleUploadTwofiles--")
-
        tmpdir, _ := ioutil.TempDir("", "")
        defer func() {
                os.RemoveAll(tmpdir)
@@ -54,8 +53,6 @@ func (s *TestSuite) TestSimpleUploadTwofiles(c *C) {
 }
 
 func (s *TestSuite) TestSimpleUploadSubdir(c *C) {
-       log.Print("--TestSimpleUploadSubdir--")
-
        tmpdir, _ := ioutil.TempDir("", "")
        defer func() {
                os.RemoveAll(tmpdir)
@@ -74,8 +71,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 +78,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 +94,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 +110,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 +131,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)