Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkg/client: move upload test to pkg/test/integration 

In 877eafa49b , pkg/server started
importing pkg/client , since the server has to be able to fetch blobs
from a share claim of another server. This introduced a circular
dependency in tests, as pkg/client/upload_test.go instantiates a server.

As the test uses both a client and a server, and tests uploading between
the two, it seems fitting to move it to pkg/test/integration, which
breaks the circular dep.

Change-Id: I2458ffd72912ff6e9c1a0f67e187d54cc895c2e9
This commit is contained in:
mpl 2018-06-27 21:07:53 +02:00
parent 2409082b78
commit a538874c07
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/client/upload_test.go → pkg/test/integration/upload_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package client
package integration
import (
"context"
@ -28,6 +28,7 @@ import (
"time"
"perkeep.org/internal/osutil"
"perkeep.org/pkg/client"
"perkeep.org/pkg/schema"
"perkeep.org/pkg/serverinit"
"perkeep.org/pkg/types/serverconfig"
@ -71,7 +72,7 @@ func TestUploadFile(t *testing.T) {
ts := newTestServer(t)
defer ts.Close()
c := NewOrFail(OptionServer(ts.URL))
c := client.NewOrFail(client.OptionServer(ts.URL))
f := newFakeFile("foo.txt", "bar", time.Date(2011, 1, 28, 2, 3, 4, 0, time.Local))
@ -88,10 +89,10 @@ func TestUploadFile(t *testing.T) {
}
// testUploadFile uploads a file and checks if it can be retrieved.
func testUploadFile(t *testing.T, c *Client, f *fakeFile, withFileOpts bool) *schema.Blob {
var opts *FileUploadOptions
func testUploadFile(t *testing.T, c *client.Client, f *fakeFile, withFileOpts bool) *schema.Blob {
var opts *client.FileUploadOptions
if withFileOpts {
opts = &FileUploadOptions{FileInfo: f}
opts = &client.FileUploadOptions{FileInfo: f}
}
bref, err := c.UploadFile(ctxbg, f.Name(), strings.NewReader(f.content), opts)
if err != nil {