Fix tests and docker-entrypoint.sh

library/plone

@@ -5,15 +5,15 @@ GitRepo: https://github.com/plone/plone.docker.git
 
 Tags: 5.2.0, 5.2, 5, latest
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 73670210baacd56afb7d248c7b1fb99433f43d41
+GitCommit: a96300660c82481f1107d545ce69c770a3676acd
 Directory: 5.2/5.2.0/debian
 
 Tags: 5.2.0-alpine, 5.2-alpine, 5-alpine, alpine
 Architectures: amd64, arm32v6, arm64v8, i386, ppc64le, s390x
-GitCommit: 73670210baacd56afb7d248c7b1fb99433f43d41
+GitCommit: a96300660c82481f1107d545ce69c770a3676acd
 Directory: 5.2/5.2.0/alpine
 
 Tags: 5.2.0-python2, 5.2-python2, 5-python2, python2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 73670210baacd56afb7d248c7b1fb99433f43d41
+GitCommit: a96300660c82481f1107d545ce69c770a3676acd
 Directory: 5.2/5.2.0/python2

test/tests/plone-basics/run.sh

@@ -15,17 +15,17 @@ trap "docker rm -vf $cid > /dev/null" EXIT
 get() {
 	docker run --rm -i \
 		--link "$cname":plone \
-		--entrypoint python \
+		--entrypoint /plone/instance/bin/zopepy \
 		"$image" \
-		-c "import urllib2; con = urllib2.urlopen('$1'); print con.read()"
+		-c "from six.moves.urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
 }
 
 get_auth() {
 	docker run --rm -i \
 		--link "$cname":plone \
-		--entrypoint python \
+		--entrypoint /plone/instance/bin/zopepy \
 		"$image" \
-		-c "import urllib2; request = urllib2.Request('$1'); request.add_header('Authorization', 'Basic $2'); print urllib2.urlopen(request).read()"
+		-c "from six.moves.urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
 }
 
 

test/tests/plone-zeoclient/run.sh

@@ -22,17 +22,17 @@ trap "docker rm -vf $pid $zid > /dev/null" EXIT
 get() {
 	docker run --rm -i \
 		--link "$pname":plone \
-		--entrypoint python \
+		--entrypoint /plone/instance/bin/zopepy \
 		"$image" \
-		-c "import urllib2; con = urllib2.urlopen('$1'); print con.read()"
+		-c "from six.moves.urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
 }
 
 get_auth() {
 	docker run --rm -i \
 		--link "$pname":plone \
-		--entrypoint python \
+		--entrypoint /plone/instance/bin/zopepy \
 		"$image" \
-		-c "import urllib2; request = urllib2.Request('$1'); request.add_header('Authorization', 'Basic $2'); print urllib2.urlopen(request).read()"
+		-c "from six.moves.urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
 }
 
 . "$dir/../../retry.sh" --tries "$PLONE_TEST_TRIES" --sleep "$PLONE_TEST_SLEEP" get "http://plone:8080"