diff --git a/tests/unittests/test_data.py b/tests/unittests/test_data.py index 204765e4874..7861afc2019 100644 --- a/tests/unittests/test_data.py +++ b/tests/unittests/test_data.py @@ -23,7 +23,6 @@ from cloudinit import util from cloudinit.config.modules import Modules from cloudinit.settings import DEFAULT_RUN_DIR, PER_INSTANCE -from tests.unittests import helpers from tests.unittests.util import FakeDataSource MPATH = "cloudinit.stages" @@ -790,29 +789,29 @@ def test_compressed_in_userdata(self, ud_proc): assert count_messages(message) == 1 -class TestConvertString(helpers.TestCase): +class TestConvertString: def test_handles_binary_non_utf8_decodable(self): """Printable unicode (not utf8-decodable) is safely converted.""" blob = b"#!/bin/bash\necho \xc3\x84\n" msg = ud.convert_string(blob) - self.assertEqual(blob, msg.get_payload(decode=True)) + assert blob == msg.get_payload(decode=True) def test_handles_binary_utf8_decodable(self): blob = b"\x32\x32" msg = ud.convert_string(blob) - self.assertEqual(blob, msg.get_payload(decode=True)) + assert blob == msg.get_payload(decode=True) def test_handle_headers(self): text = "hi mom" msg = ud.convert_string(text) - self.assertEqual(text, msg.get_payload(decode=False)) + assert text == msg.get_payload(decode=False) def test_handle_mime_parts(self): """Mime parts are properly returned as a mime message.""" message = MIMEBase("text", "plain") message.set_payload("Just text") msg = ud.convert_string(str(message)) - self.assertEqual("Just text", msg.get_payload(decode=False)) + assert "Just text" == msg.get_payload(decode=False) class TestFetchBaseConfig: