Fix tests

eea · Jan 30, 2023 · 7455b64 · 7455b64
1 parent 43ee915
commit 7455b64
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 14 deletions.
diff --git a/test/tests/plone-arbitrary-user/run.sh b/test/tests/plone-arbitrary-user/run.sh
@@ -19,15 +19,15 @@ get() {
 		--link "$cname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
+		-c "from urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
 }
 
 get_auth() {
 	docker run --rm -i \
 		--link "$cname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
+		-c "from urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
 }
 
 

diff --git a/test/tests/plone-basics/run.sh b/test/tests/plone-basics/run.sh
@@ -17,15 +17,15 @@ get() {
 		--link "$cname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
+		-c "from urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
 }
 
 get_auth() {
 	docker run --rm -i \
 		--link "$cname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
+		-c "from urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
 }
 
 

diff --git a/test/tests/plone-develop/expected-std-out.txt b/test/tests/plone-develop/expected-std-out.txt
@@ -1,6 +1,6 @@
 =======================================================================================
 Installing DEVELOPment addons /app/src/helloworld
 THIS IS NOT MEANT TO BE USED IN PRODUCTION
-Read about it: https://github.com/plone/plone-backend/#extending-from-this-image
+Read about it: https://6.docs.plone.org/install/containers/images/backend.html
 =======================================================================================
 Hello World!
diff --git a/test/tests/plone-listenport/run.sh b/test/tests/plone-listenport/run.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -eo pipefail
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+image="$1"
+
+PLONE_TEST_SLEEP=3
+PLONE_TEST_TRIES=5
+
+cname="plone-container-$RANDOM-$RANDOM"
+cid="$(docker run -d --name "$cname" -e LISTEN_PORT=8081 "$image")"
+trap "docker rm -vf $cid > /dev/null" EXIT
+
+get() {
+	docker run --rm -i \
+		--link "$cname":plone \
+		--entrypoint /app/bin/python \
+		"$image" \
+		-c "from urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
+}
+
+. "$dir/../../retry.sh" --tries "$PLONE_TEST_TRIES" --sleep "$PLONE_TEST_SLEEP" get "http://plone:8081"
+
+# Plone is up and running
+[[ "$(get 'http://plone:8081')" == *"Plone is up and running"* ]]
diff --git a/test/tests/plone-relstorage/run.sh b/test/tests/plone-relstorage/run.sh
@@ -25,15 +25,15 @@ get() {
 		--link "$pname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
+		-c "from urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
 }
 
 get_auth() {
 	docker run --rm -i \
 		--link "$pname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
+		-c "from 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"

diff --git a/test/tests/plone-shared-blob-dir/run.sh b/test/tests/plone-shared-blob-dir/run.sh
@@ -25,15 +25,15 @@ get() {
 		--link "${pname}":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
+		-c "from urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
 }
 
 get_auth() {
 	docker run --rm -i \
 		--link "${pname}":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
+		-c "from 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"

diff --git a/test/tests/plone-site/run.sh b/test/tests/plone-site/run.sh
@@ -18,19 +18,19 @@ get() {
 		--link "$cname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
+		-c "from urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
 }
 
 get_auth() {
 	docker run --rm -i \
 		--link "$cname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
+		-c "from 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"
 
 # Plone is up and running
-[[ "$(get "http://plone:8080/$site/en")" == *"English"* ]]
+[[ "$(get "http://plone:8080/$site")" == *"Welcome to Plone"* ]]
diff --git a/test/tests/plone-zeoclient/run.sh b/test/tests/plone-zeoclient/run.sh
@@ -25,15 +25,15 @@ get() {
 		--link "$pname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
+		-c "from urllib.request import urlopen; con = urlopen('$1'); print(con.read())"
 }
 
 get_auth() {
 	docker run --rm -i \
 		--link "$pname":plone \
 		--entrypoint /app/bin/python \
 		"$image" \
-		-c "from six.moves.urllib.request import urlopen, Request; request = Request('$1'); request.add_header('Authorization', 'Basic $2'); print(urlopen(request).read())"
+		-c "from 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"