X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9e5b98e8f5f4727856b53447191f9c06e3da2ba6..1e31815d4a0d094633d4acb4f6265d6b8b6e3246:/services/crunch-run/upload_test.go diff --git a/services/crunch-run/upload_test.go b/services/crunch-run/upload_test.go index b4b1efd107..86ad1b32ae 100644 --- a/services/crunch-run/upload_test.go +++ b/services/crunch-run/upload_test.go @@ -1,3 +1,7 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + package main import ( @@ -21,7 +25,7 @@ func (s *TestSuite) TestSimpleUpload(c *C) { ioutil.WriteFile(tmpdir+"/"+"file1.txt", []byte("foo"), 0600) - cw := CollectionWriter{&KeepTestClient{}, nil, sync.Mutex{}} + cw := CollectionWriter{0, &KeepTestClient{}, nil, nil, sync.Mutex{}} str, err := cw.WriteTree(tmpdir, log.New(os.Stdout, "", 0)) c.Check(err, IsNil) c.Check(str, Equals, ". acbd18db4cc2f85cedef654fccc4a4d8+3 0:3:file1.txt\n") @@ -36,7 +40,7 @@ func (s *TestSuite) TestSimpleUploadTwofiles(c *C) { ioutil.WriteFile(tmpdir+"/"+"file1.txt", []byte("foo"), 0600) ioutil.WriteFile(tmpdir+"/"+"file2.txt", []byte("bar"), 0600) - cw := CollectionWriter{&KeepTestClient{}, nil, sync.Mutex{}} + cw := CollectionWriter{0, &KeepTestClient{}, nil, nil, sync.Mutex{}} str, err := cw.WriteTree(tmpdir, log.New(os.Stdout, "", 0)) c.Check(err, IsNil) @@ -54,7 +58,7 @@ func (s *TestSuite) TestSimpleUploadSubdir(c *C) { ioutil.WriteFile(tmpdir+"/"+"file1.txt", []byte("foo"), 0600) ioutil.WriteFile(tmpdir+"/subdir/file2.txt", []byte("bar"), 0600) - cw := CollectionWriter{&KeepTestClient{}, nil, sync.Mutex{}} + cw := CollectionWriter{0, &KeepTestClient{}, nil, nil, sync.Mutex{}} str, err := cw.WriteTree(tmpdir, log.New(os.Stdout, "", 0)) c.Check(err, IsNil) @@ -88,7 +92,7 @@ func (s *TestSuite) TestSimpleUploadLarge(c *C) { ioutil.WriteFile(tmpdir+"/"+"file2.txt", []byte("bar"), 0600) - cw := CollectionWriter{&KeepTestClient{}, nil, sync.Mutex{}} + cw := CollectionWriter{0, &KeepTestClient{}, nil, nil, sync.Mutex{}} str, err := cw.WriteTree(tmpdir, log.New(os.Stdout, "", 0)) c.Check(err, IsNil) @@ -105,7 +109,7 @@ func (s *TestSuite) TestUploadEmptySubdir(c *C) { ioutil.WriteFile(tmpdir+"/"+"file1.txt", []byte("foo"), 0600) - cw := CollectionWriter{&KeepTestClient{}, nil, sync.Mutex{}} + cw := CollectionWriter{0, &KeepTestClient{}, nil, nil, sync.Mutex{}} str, err := cw.WriteTree(tmpdir, log.New(os.Stdout, "", 0)) c.Check(err, IsNil) @@ -121,7 +125,7 @@ func (s *TestSuite) TestUploadEmptyFile(c *C) { ioutil.WriteFile(tmpdir+"/"+"file1.txt", []byte(""), 0600) - cw := CollectionWriter{&KeepTestClient{}, nil, sync.Mutex{}} + cw := CollectionWriter{0, &KeepTestClient{}, nil, nil, sync.Mutex{}} str, err := cw.WriteTree(tmpdir, log.New(os.Stdout, "", 0)) c.Check(err, IsNil) @@ -137,7 +141,7 @@ func (s *TestSuite) TestUploadError(c *C) { ioutil.WriteFile(tmpdir+"/"+"file1.txt", []byte("foo"), 0600) - cw := CollectionWriter{&KeepErrorTestClient{}, nil, sync.Mutex{}} + cw := CollectionWriter{0, &KeepErrorTestClient{}, nil, nil, sync.Mutex{}} str, err := cw.WriteTree(tmpdir, log.New(os.Stdout, "", 0)) c.Check(err, NotNil)