Skip to content

Commit

Permalink
Fix e2e test service issue
Browse files Browse the repository at this point in the history
Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>
  • Loading branch information
kakkoyun committed Mar 10, 2020
1 parent ba0d7d6 commit d99f86c
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions test/e2e/compact_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,16 @@ func TestCompact(t *testing.T) {
m := e2edb.NewMinio(80, bucket)
testutil.Ok(t, s.StartAndWaitReady(m))

s3Config := s3.Config{
series := []labels.Labels{labels.FromStrings("a", "1", "b", "2")}
extLset := labels.FromStrings("ext1", "value1", "replica", "1")

bkt, err := s3.NewBucketWithConfig(l, s3.Config{
Bucket: bucket,
AccessKey: e2edb.MinioAccessKey,
SecretKey: e2edb.MinioSecretKey,
Endpoint: m.NetworkHTTPEndpoint(),
Endpoint: m.HTTPEndpoint(),
Insecure: true,
}

series := []labels.Labels{labels.FromStrings("a", "1", "b", "2")}
extLset := labels.FromStrings("ext1", "value1", "replica", "1")

bkt, err := s3.NewBucketWithConfig(l, s3Config, "test-feed")
}, "test-feed")
testutil.Ok(t, err)

dir := filepath.Join(s.SharedDir(), "tmp")
Expand All @@ -63,8 +61,14 @@ func TestCompact(t *testing.T) {
testutil.Ok(t, objstore.UploadDir(ctx, l, bkt, path.Join(dir, id1.String()), id1.String()))

compact, err := e2ethanos.NewCompact(s.SharedDir(), "compact", client.BucketConfig{
Type: client.S3,
Config: s3Config,
Type: client.S3,
Config: s3.Config{
Bucket: bucket,
AccessKey: e2edb.MinioAccessKey,
SecretKey: e2edb.MinioSecretKey,
Endpoint: m.NetworkHTTPEndpoint(),
Insecure: true,
},
})

testutil.Ok(t, err)
Expand Down

0 comments on commit d99f86c

Please sign in to comment.