Skip to content

Commit 43282f1

Browse files
fix tests for py3;
1 parent d6d0349 commit 43282f1

File tree

3 files changed

+63
-66
lines changed

3 files changed

+63
-66
lines changed

base/redhat-8/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ microdnf remove -y make gcc openssl-devel bzip2-devel findutils glib2-devel glib
7878
microdnf clean all
7979

8080
# Install busybox direct from the multiarch since EPEL isn't available yet for redhat8
81-
BUSYBOX_URL=${BUSYBOX_URL:=https://busybox.net/downloads/binaries/1.35.0-`arch`-linux-musl/busybox}
81+
BUSYBOX_URL=${BUSYBOX_URL:=https://busybox.net/downloads/binaries/1.35.0-x86_64-linux-musl/busybox}
8282
wget -O /bin/busybox ${BUSYBOX_URL}
8383
chmod +x /bin/busybox
8484

tests/executor.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
from string import ascii_lowercase
2020
# Code to suppress insecure https warnings
2121
import urllib3
22-
from urllib3.exceptions import InsecureRequestWarning, SubjectAltNameWarning
23-
urllib3.disable_warnings(InsecureRequestWarning)
24-
urllib3.disable_warnings(SubjectAltNameWarning)
22+
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
2523

2624

2725
# Define variables
@@ -101,9 +99,9 @@ def get_container_logs(self, container_id):
10199
stream = self.client.logs(container_id, stream=True)
102100
output = ""
103101
for char in stream:
104-
if "Ansible playbook complete" in char:
102+
if "Ansible playbook complete" in char.decode():
105103
break
106-
output += char
104+
output += char.decode()
107105
return output
108106

109107
def cleanup_files(self, files):

0 commit comments

Comments
 (0)