File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ CONTAINER:
44 - docker
55 - podman
66 REGISTRY_HUB: https://mirror.gcr.io
7- UPSTREAM_NAME: 'library/busybox'
7+ UPSTREAM_NAME: jmalloc/echo-server
88 ALTERNATIVE_UPSTREAM_NAMES:
99 - hello-world
1010 - alpine
Original file line number Diff line number Diff line change 119119 'container.upstream_name' ,
120120 must_exist = True ,
121121 is_type_of = str ,
122- default = 'library/busybox ' ,
122+ default = 'jmalloc/echo-server ' ,
123123 ),
124124 Validator (
125125 'container.alternative_upstream_names' ,
Original file line number Diff line number Diff line change 1010
1111"""
1212
13+ import re
14+
1315from fauxfactory import gen_string
1416import pytest
1517from wait_for import wait_for
@@ -92,16 +94,18 @@ def test_positive_pull_image(
9294 )
9395 assert result .status == 0
9496 try :
95- result = module_container_contenthost .execute (f'docker run { repo ["published-at" ]} ' )
97+ result = module_container_contenthost .execute (
98+ f'docker run -d { repo ["published-at" ]} '
99+ )
96100 assert result .status == 0
101+ match = re .match (r'^[0-9a-f]+$' , result .stdout )
102+ if match :
103+ container_id = match .group (0 )
97104 finally :
98105 # Stop and remove the container
99- result = module_container_contenthost .execute (
100- f'docker ps -a | grep { repo ["published-at" ]} '
101- )
102- container_id = result .stdout [0 ].split ()[0 ]
103- module_container_contenthost .execute (f'docker stop { container_id } ' )
104- module_container_contenthost .execute (f'docker rm { container_id } ' )
106+ if container_id :
107+ module_container_contenthost .execute (f'docker stop { container_id } ' )
108+ module_container_contenthost .execute (f'docker rm { container_id } ' )
105109 finally :
106110 # Remove docker image
107111 module_container_contenthost .execute (f'docker rmi { repo ["published-at" ]} ' )
You can’t perform that action at this time.
0 commit comments