Merge pull request #55 from SpectraLogic/content_length_fix

 Removing dependency on core module from integration test

Author: RachelTucker

ds3_integration/nilReadSizer.go

@@ -0,0 +1,31 @@
+// Copyright 2014-2018 Spectra Logic Corporation. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+// this file except in compliance with the License. A copy of the License is located at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// or in the "license" file accompanying this file.
+// This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+package ds3_integration
+
+import "io"
+
+type nilReadSizer struct {
+	reader io.Reader
+	fileSize int64
+}
+
+func newNilReadSizer(reader io.Reader, fileSize int64) nilReadSizer {
+	return nilReadSizer { reader: reader, fileSize: fileSize }
+}
+
+func (readSizer *nilReadSizer) Read(p []byte) (n int, err error) {
+	return readSizer.reader.Read(p)
+}
+
+func (readSizer *nilReadSizer) Size() (int64, error) {
+	return readSizer.fileSize, nil
+}

ds3_integration/smoke_test.go

@@ -22,7 +22,6 @@ import (
     "bytes"
     "spectra/ds3_go_sdk/ds3_utils/ds3Testing"
     "strconv"
-    "spectra/core/ioutils"
 )
 
 var client *ds3.Client
@@ -481,7 +480,7 @@ func TestPuttingFolder(t *testing.T) {
 
     const folderPath = "Gracie/Eskimo/"
 
-    readSizer := ioutils.NewReadSizer(nil, 0)
+    readSizer := newNilReadSizer(nil, 0)
     putObjectRequest := models.NewPutObjectRequest(bucketName, folderPath, &readSizer)
     _, err = client.PutObject(putObjectRequest)
     ds3Testing.AssertNilError(t, err)