Skip to content

Commit 64a0d7b

Browse files
jromerojromero
committed
Adjust acceptance tests to new package restructure
Signed-off-by: Javier Romero <rjavier@vmware.com>
1 parent 63bebc7 commit 64a0d7b

23 files changed

Lines changed: 85 additions & 71 deletions

‎acceptance/config/github_asset_fetcher.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import (
2626
"github.com/pkg/errors"
2727
"golang.org/x/oauth2"
2828

29-
"github.com/buildpacks/pack/logging"
3029
"github.com/buildpacks/pack/pkg/blob"
30+
"github.com/buildpacks/pack/pkg/logging"
3131
)
3232

3333
const (
@@ -376,7 +376,7 @@ func (f *GithubAssetFetcher) writeCacheManifest(owner, repo string, op func(cach
376376
func (f *GithubAssetFetcher) downloadAndSave(assetURI, destPath string) error {
377377
f.testObject.Helper()
378378

379-
downloader := blob.NewDownloader(logging.New(&testWriter{t: f.testObject}), f.cacheDir)
379+
downloader := blob.NewDownloader(logging.NewSimpleLogger(&testWriter{t: f.testObject}), f.cacheDir)
380380

381381
assetBlob, err := downloader.Download(f.ctx, assetURI)
382382
if err != nil {
@@ -405,7 +405,7 @@ func (f *GithubAssetFetcher) downloadAndSave(assetURI, destPath string) error {
405405
func (f *GithubAssetFetcher) downloadAndExtractTgz(assetURI, destDir string) error {
406406
f.testObject.Helper()
407407

408-
downloader := blob.NewDownloader(logging.New(&testWriter{t: f.testObject}), f.cacheDir)
408+
downloader := blob.NewDownloader(logging.NewSimpleLogger(&testWriter{t: f.testObject}), f.cacheDir)
409409

410410
assetBlob, err := downloader.Download(f.ctx, assetURI)
411411
if err != nil {

‎internal/builder/builder.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ func addBuildpacks(logger logging.Logger, tmpDir string, image imgutil.Image, ad
392392
}
393393

394394
// create tar file
395-
bpLayerTar, err := buildpack.BuildpackToLayerTar(bpTmpDir, bp)
395+
bpLayerTar, err := buildpack.ToLayerTar(bpTmpDir, bp)
396396
if err != nil {
397397
return err
398398
}

‎internal/builder/testmocks/mock_lifecycle.go‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/commands/testmocks/mock_inspect_image_writer_factory.go‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/commands/testmocks/mock_pack_client.go‎

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/fakes/fake_package.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type fakePackage struct {
2828

2929
func NewPackage(tmpDir string, name string, buildpacks []buildpack.Buildpack) (Package, error) {
3030
processBuildpack := func(bp buildpack.Buildpack) (tarFile string, diffID string, err error) {
31-
tarFile, err = buildpack.BuildpackToLayerTar(tmpDir, bp)
31+
tarFile, err = buildpack.ToLayerTar(tmpDir, bp)
3232
if err != nil {
3333
return "", "", err
3434
}

‎internal/term/term_test.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,11 @@ import (
1212
h "github.com/buildpacks/pack/testhelpers"
1313
)
1414

15-
const (
16-
testTime = "2019/05/15 01:01:01.000000"
17-
)
18-
1915
func TestTerm(t *testing.T) {
2016
spec.Run(t, "Term", testTerm, spec.Parallel(), spec.Report(report.Terminal{}))
2117
}
2218

2319
func testTerm(t *testing.T, when spec.G, it spec.S) {
24-
2520
when("#IsTerminal", func() {
2621
it("returns false for a pipe", func() {
2722
r, _, _ := os.Pipe()

‎pkg/buildpack/builder.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (b *PackageBuilder) finalizeImage(image WorkableImage, tmpDir string) error
9292

9393
bpLayers := dist.BuildpackLayers{}
9494
for _, bp := range append(b.dependencies, b.buildpack) {
95-
bpLayerTar, err := BuildpackToLayerTar(tmpDir, bp)
95+
bpLayerTar, err := ToLayerTar(tmpDir, bp)
9696
if err != nil {
9797
return err
9898
}

‎pkg/buildpack/buildpack.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ func (b *buildpack) Descriptor() dist.BuildpackDescriptor {
4141
return b.descriptor
4242
}
4343

44-
// BuildpackFromBlob constructs a buildpack from a blob. It is assumed that the buildpack
44+
// FromBlob constructs a buildpack from a blob. It is assumed that the buildpack
4545
// contents are structured as per the distribution spec (currently '/cnbs/buildpacks/{ID}/{version}/*').
46-
func BuildpackFromBlob(bpd dist.BuildpackDescriptor, blob Blob) Buildpack {
46+
func FromBlob(bpd dist.BuildpackDescriptor, blob Blob) Buildpack {
4747
return &buildpack{
4848
Blob: blob,
4949
descriptor: bpd,
5050
}
5151
}
5252

53-
// BuildpackFromRootBlob constructs a buildpack from a blob. It is assumed that the buildpack contents reside at the
53+
// FromRootBlob constructs a buildpack from a blob. It is assumed that the buildpack contents reside at the
5454
// root of the blob. The constructed buildpack contents will be structured as per the distribution spec (currently
5555
// a tar with contents under '/cnbs/buildpacks/{ID}/{version}/*').
56-
func BuildpackFromRootBlob(blob Blob, layerWriterFactory archive.TarWriterFactory) (Buildpack, error) {
56+
func FromRootBlob(blob Blob, layerWriterFactory archive.TarWriterFactory) (Buildpack, error) {
5757
bpd := dist.BuildpackDescriptor{}
5858
rc, err := blob.Open()
5959
if err != nil {
@@ -219,7 +219,7 @@ func validateDescriptor(bpd dist.BuildpackDescriptor) error {
219219
return nil
220220
}
221221

222-
func BuildpackToLayerTar(dest string, bp Buildpack) (string, error) {
222+
func ToLayerTar(dest string, bp Buildpack) (string, error) {
223223
bpd := bp.Descriptor()
224224
bpReader, err := bp.Open()
225225
if err != nil {

‎pkg/buildpack/buildpack_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func testBuildpack(t *testing.T, when spec.G, it spec.S) {
5050

5151
when("#BuildpackFromRootBlob", func() {
5252
it("parses the descriptor file", func() {
53-
bp, err := buildpack.BuildpackFromRootBlob(
53+
bp, err := buildpack.FromRootBlob(
5454
&readerBlob{
5555
openFn: func() io.ReadCloser {
5656
tarBuilder := archive.TarBuilder{}
@@ -80,7 +80,7 @@ id = "some.stack.id"
8080
})
8181

8282
it("translates blob to distribution format", func() {
83-
bp, err := buildpack.BuildpackFromRootBlob(
83+
bp, err := buildpack.FromRootBlob(
8484
&readerBlob{
8585
openFn: func() io.ReadCloser {
8686
tarBuilder := archive.TarBuilder{}
@@ -162,7 +162,7 @@ id = "some.stack.id"
162162
},
163163
}
164164

165-
bp, err := buildpack.BuildpackFromRootBlob(
165+
bp, err := buildpack.FromRootBlob(
166166
&errorBlob{
167167
realBlob: realBlob,
168168
},
@@ -191,7 +191,7 @@ id = "some.stack.id"
191191

192192
when("no exec bits set", func() {
193193
it("sets to 0755 if directory", func() {
194-
bp, err := buildpack.BuildpackFromRootBlob(
194+
bp, err := buildpack.FromRootBlob(
195195
&readerBlob{
196196
openFn: func() io.ReadCloser {
197197
tarBuilder := archive.TarBuilder{}
@@ -216,7 +216,7 @@ id = "some.stack.id"
216216

217217
when("no exec bits set", func() {
218218
it("sets to 0755 if 'bin/detect' or 'bin/build'", func() {
219-
bp, err := buildpack.BuildpackFromRootBlob(
219+
bp, err := buildpack.FromRootBlob(
220220
&readerBlob{
221221
openFn: func() io.ReadCloser {
222222
tarBuilder := archive.TarBuilder{}
@@ -247,7 +247,7 @@ id = "some.stack.id"
247247

248248
when("not directory, 'bin/detect', or 'bin/build'", func() {
249249
it("sets to 0755 if ANY exec bit is set", func() {
250-
bp, err := buildpack.BuildpackFromRootBlob(
250+
bp, err := buildpack.FromRootBlob(
251251
&readerBlob{
252252
openFn: func() io.ReadCloser {
253253
tarBuilder := archive.TarBuilder{}
@@ -272,7 +272,7 @@ id = "some.stack.id"
272272

273273
when("not directory, 'bin/detect', or 'bin/build'", func() {
274274
it("sets to 0644 if NO exec bits set", func() {
275-
bp, err := buildpack.BuildpackFromRootBlob(
275+
bp, err := buildpack.FromRootBlob(
276276
&readerBlob{
277277
openFn: func() io.ReadCloser {
278278
tarBuilder := archive.TarBuilder{}
@@ -298,7 +298,7 @@ id = "some.stack.id"
298298

299299
when("there is no descriptor file", func() {
300300
it("returns error", func() {
301-
_, err := buildpack.BuildpackFromRootBlob(
301+
_, err := buildpack.FromRootBlob(
302302
&readerBlob{
303303
openFn: func() io.ReadCloser {
304304
tarBuilder := archive.TarBuilder{}
@@ -313,7 +313,7 @@ id = "some.stack.id"
313313

314314
when("there is no api field", func() {
315315
it("assumes an api version", func() {
316-
bp, err := buildpack.BuildpackFromRootBlob(
316+
bp, err := buildpack.FromRootBlob(
317317
&readerBlob{
318318
openFn: func() io.ReadCloser {
319319
tarBuilder := archive.TarBuilder{}
@@ -336,7 +336,7 @@ id = "some.stack.id"`))
336336

337337
when("there is no id", func() {
338338
it("returns error", func() {
339-
_, err := buildpack.BuildpackFromRootBlob(
339+
_, err := buildpack.FromRootBlob(
340340
&readerBlob{
341341
openFn: func() io.ReadCloser {
342342
tarBuilder := archive.TarBuilder{}
@@ -358,7 +358,7 @@ id = "some.stack.id"`))
358358

359359
when("there is no version", func() {
360360
it("returns error", func() {
361-
_, err := buildpack.BuildpackFromRootBlob(
361+
_, err := buildpack.FromRootBlob(
362362
&readerBlob{
363363
openFn: func() io.ReadCloser {
364364
tarBuilder := archive.TarBuilder{}
@@ -380,7 +380,7 @@ id = "some.stack.id"`))
380380

381381
when("both stacks and order are present", func() {
382382
it("returns error", func() {
383-
_, err := buildpack.BuildpackFromRootBlob(
383+
_, err := buildpack.FromRootBlob(
384384
&readerBlob{
385385
openFn: func() io.ReadCloser {
386386
tarBuilder := archive.TarBuilder{}
@@ -408,7 +408,7 @@ id = "some.stack.id"
408408

409409
when("missing stacks and order", func() {
410410
it("returns error", func() {
411-
_, err := buildpack.BuildpackFromRootBlob(
411+
_, err := buildpack.FromRootBlob(
412412
&readerBlob{
413413
openFn: func() io.ReadCloser {
414414
tarBuilder := archive.TarBuilder{}

0 commit comments

Comments
 (0)