docker image tests: fix comparisons with container logs

Author: angelo-v

docker-image/test/test_non_accessible_key_cert.py

@@ -29,8 +29,8 @@ def container(client, image):
 
 def test_container_fails_with_errors(container):
   assert container.status == "created"
-  logs = container.logs()
-  assert "✗ /root not readable by node" in logs
-  assert "✗ /etc/shadow not readable by node" in logs
+  logs = str(container.logs())
+  assert "/root not readable by node" in logs
+  assert "/etc/shadow not readable by node" in logs
   assert "Finished: ERROR" in logs
   assert not "Finished: SUCCESS" in logs

docker-image/test/test_precondition_checks.py

@@ -31,11 +31,11 @@ def container(client, image):
 
 def test_container_fails_with_errors(container):
   assert container.status == "created"
-  logs = container.logs()
-  assert "✗ /opt/solid/config not writable by node" in logs
-  assert "✗ /opt/solid/data not writable by node" in logs
-  assert "✗ /opt/solid/.db not writable by node" in logs
-  assert "✗ /missing/key does not exist" in logs
-  assert "✗ /missing/cert does not exist" in logs
+  logs = str(container.logs())
+  assert "/opt/solid/config not writable by node" in logs
+  assert "/opt/solid/data not writable by node" in logs
+  assert "/opt/solid/.db not writable by node" in logs
+  assert "/missing/key does not exist" in logs
+  assert "/missing/cert does not exist" in logs
   assert "Finished: ERROR" in logs
   assert not "Finished: SUCCESS" in logs

docker-image/test/wait_for_container.py

@@ -2,7 +2,7 @@
 
 def wait_for_container(container, message="running on"):
     count = 0
-    while (not message in container.logs()) and (count < 10):
+    while (not message in str(container.logs())) and (count < 10):
         count = count + 1
         time.sleep(1)
-    assert message in container.logs(), 'Expected message not present until timeout. Waited for "%s"' % message
+    assert message in str(container.logs()), 'Expected message not present until timeout. Waited for "%s"' % message