Skip to content

Commit b45294d

Browse files
FAB-9639 restore test for docker pull
multiarch is published, this test can be restored Change-Id: I917ced77a7e26d0341e360dfb65ebded7283e056 Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
1 parent 8b19d4e commit b45294d

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

core/chaincode/platforms/util/utils_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@ func createTempFile(t *testing.T) string {
331331

332332
// TODO restore this test once multi-arch has been established
333333
func TestDockerPull(t *testing.T) {
334-
t.Skip()
335334
codepackage, output := io.Pipe()
336335
go func() {
337336
tw := tar.NewWriter(output)
@@ -342,7 +341,7 @@ func TestDockerPull(t *testing.T) {
342341

343342
binpackage := bytes.NewBuffer(nil)
344343

345-
// Perform a nop operation within a fixed target. We choose 1.0.0-alpha2 because we know it's
344+
// Perform a nop operation within a fixed target. We choose 1.1.0 because we know it's
346345
// published and available. Ideally we could choose something that we know is both multi-arch
347346
// and ok to delete prior to executing DockerBuild. This would ensure that we exercise the
348347
// image pull logic. However, no suitable target exists that meets all the criteria. Therefore
@@ -354,7 +353,7 @@ func TestDockerPull(t *testing.T) {
354353
// Future considerations: publish a known dummy image that is multi-arch and free to randomly
355354
// delete, and use that here instead.
356355
err := DockerBuild(DockerBuildOptions{
357-
Image: cutil.ParseDockerfileTemplate("hyperledger/fabric-ccenv:$(ARCH)-1.0.0-alpha2"),
356+
Image: cutil.ParseDockerfileTemplate("hyperledger/fabric-ccenv:$(ARCH)-1.1.0"),
358357
Cmd: "/bin/true",
359358
InputStream: codepackage,
360359
OutputStream: binpackage,

0 commit comments

Comments
 (0)