[ARVADOS] updated: 929b50599171de18c886ffa0477d296877b257fb
Git user
git at public.curoverse.com
Wed Feb 1 16:29:44 EST 2017
Summary of changes:
build/build.list | 34 +++++++--------
build/package-build-dockerfiles/Makefile | 6 ++-
.../{ubuntu1204 => ubuntu1604}/Dockerfile | 10 ++---
.../{ubuntu1204 => ubuntu1604}/Dockerfile | 11 +++--
.../ubuntu1604/etc-apt-preferences.d-arvados | 3 ++
build/package-testing/deb-common-test-packages.sh | 2 +-
...ages-debian7.sh => test-packages-ubuntu1604.sh} | 0
build/run-build-packages-one-target.sh | 5 ++-
build/run-build-packages.sh | 3 ++
doc/_includes/_navbar_top.liquid | 2 +-
doc/user/index.html.textile.liquid | 2 +-
sdk/go/keepclient/collectionreader_test.go | 50 ++++++++++++++++++++--
12 files changed, 93 insertions(+), 35 deletions(-)
copy build/package-build-dockerfiles/{ubuntu1204 => ubuntu1604}/Dockerfile (72%)
copy build/package-test-dockerfiles/{ubuntu1204 => ubuntu1604}/Dockerfile (55%)
create mode 100644 build/package-test-dockerfiles/ubuntu1604/etc-apt-preferences.d-arvados
rename build/package-testing/{test-packages-debian7.sh => test-packages-ubuntu1604.sh} (100%)
via 929b50599171de18c886ffa0477d296877b257fb (commit)
via d6579d95bacbba5682d0c085f139681c93cb005a (commit)
via 827879be023e90d58eb681b3c930154739a0b27f (commit)
via 95d8984418a5198639000f0a622da74af259b6c5 (commit)
via 8675eec8206c0e39753741864636c8a05ce02408 (commit)
via 799b5333c66ccd18fe1b0ee97c2a28be6e07b731 (commit)
via 9dd66f4d896785e0c6dce839ed1b411dd3c77bf0 (commit)
from 24b137a5b3313778e2db7f5d1e0c82daf0634a9c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 929b50599171de18c886ffa0477d296877b257fb
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Feb 1 16:29:16 2017 -0500
10990: Add Seek tests.
diff --git a/sdk/go/keepclient/collectionreader_test.go b/sdk/go/keepclient/collectionreader_test.go
index 6f49c59..7b2e94e 100644
--- a/sdk/go/keepclient/collectionreader_test.go
+++ b/sdk/go/keepclient/collectionreader_test.go
@@ -2,10 +2,10 @@ package keepclient
import (
"crypto/md5"
- "crypto/rand"
"fmt"
"io"
"io/ioutil"
+ "math/rand"
"net/http"
"os"
"strconv"
@@ -161,28 +161,70 @@ func (s *CollectionReaderUnit) TestCollectionReaderContent(c *check.C) {
func (s *CollectionReaderUnit) TestCollectionReaderManyBlocks(c *check.C) {
h := md5.New()
+ var testdata []byte
buf := make([]byte, 4096)
locs := make([]string, len(buf))
filesize := 0
for i := 0; i < len(locs); i++ {
- _, err := io.ReadFull(rand.Reader, buf[:i])
- c.Assert(err, check.IsNil)
+ _, err := rand.Read(buf[:i])
h.Write(buf[:i])
locs[i], _, err = s.kc.PutB(buf[:i])
c.Assert(err, check.IsNil)
filesize += i
+ testdata = append(testdata, buf[:i]...)
}
manifest := "./random " + strings.Join(locs, " ") + " 0:" + strconv.Itoa(filesize) + ":bytes.bin\n"
dataMD5 := h.Sum(nil)
checkMD5 := md5.New()
rdr, err := s.kc.CollectionFileReader(map[string]interface{}{"manifest_text": manifest}, "random/bytes.bin")
- c.Check(err, check.IsNil)
+ c.Assert(err, check.IsNil)
+ defer rdr.Close()
+
_, err = io.Copy(checkMD5, rdr)
c.Check(err, check.IsNil)
_, err = rdr.Read(make([]byte, 1))
c.Check(err, check.Equals, io.EOF)
c.Check(checkMD5.Sum(nil), check.DeepEquals, dataMD5)
+
+ size, err := rdr.Seek(0, io.SeekEnd)
+ c.Check(err, check.IsNil)
+ buf = make([]byte, len(testdata))
+ copy(buf, testdata)
+ curPos := size
+ for i := 0; i < 16; i++ {
+ offset := rand.Intn(len(buf) - 1)
+ count := rand.Intn(len(buf) - offset)
+ if rand.Intn(2) == 0 {
+ curPos, err = rdr.Seek(int64(offset)-curPos, io.SeekCurrent)
+ } else {
+ curPos, err = rdr.Seek(int64(offset), io.SeekStart)
+ }
+ c.Check(curPos, check.Equals, int64(offset))
+ for count > 0 {
+ n, err := rdr.Read(buf[offset : offset+count])
+ c.Assert(err, check.IsNil)
+ c.Assert(n > 0, check.Equals, true)
+ offset += n
+ count -= n
+ }
+ curPos, err = rdr.Seek(0, io.SeekCurrent)
+ c.Check(curPos, check.Equals, int64(offset))
+ }
+ c.Check(md5.Sum(buf), check.DeepEquals, md5.Sum(testdata))
+ c.Check(buf[:1000], check.DeepEquals, testdata[:1000])
+
+ curPos, err = rdr.Seek(size+12345, io.SeekCurrent)
+ c.Check(err, check.IsNil)
+ c.Check(curPos, check.Equals, size)
+
+ curPos, err = rdr.Seek(8-size, io.SeekCurrent)
+ c.Check(err, check.IsNil)
+ c.Check(curPos, check.Equals, int64(8))
+
+ curPos, err = rdr.Seek(-9, io.SeekCurrent)
+ c.Check(err, check.NotNil)
+ c.Check(curPos, check.Equals, int64(8))
}
func (s *CollectionReaderUnit) TestCollectionReaderCloseEarly(c *check.C) {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list