kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

pylibfdt: Test fdt.setprop take bytes on Python 3, add error handling 

Signed-off-by: Petr Viktorin <pviktori@redhat.com>
Message-Id: <20190218164856.23861-3-frenzy@frenzy.cz>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
Petr Viktorin 2019-02-18 17:48:54 +01:00 committed by David Gibson
parent cb0f454f73
commit 364631626b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pylibfdt/libfdt.i
View File

@ -1084,6 +1084,10 @@ typedef uint32_t fdt32_t;
/* typemap used for fdt_setprop() */
%typemap(in) (const void *val) {
%#if PY_VERSION_HEX >= 0x03000000
if (!PyBytes_Check($input)) {
SWIG_exception_fail(SWIG_TypeError, "bytes expected in method '" "$symname"
"', argument " "$argnum"" of type '" "$type""'");
}
$1 = PyBytes_AsString($input);
%#else
$1 = PyString_AsString($input); /* char *str */

12
tests/pylibfdt_tests.py
View File

@ -82,6 +82,8 @@ TEST_VALUE64_1 = (TEST_VALUE64_1H << 32) | TEST_VALUE64_1L
PHANDLE_1 = 0x2000
PHANDLE_2 = 0x2001

TEST_BYTES_1 = b'hello world'

TEST_STRING_1 = 'hello world'
TEST_STRING_2 = 'hi world'
TEST_STRING_3 = u'unicode \u01d3'
@ -443,21 +445,21 @@ class PyLibfdtBasicTests(unittest.TestCase):
def testSetProp(self):
"""Test that we can update and create properties"""
node = self.fdt.path_offset('/subnode@1')
self.fdt.setprop(node, 'compatible', TEST_STRING_1)
self.assertEquals(TEST_STRING_1, self.fdt.getprop(node, 'compatible'))
self.fdt.setprop(node, 'compatible', TEST_BYTES_1)
self.assertEquals(TEST_BYTES_1, self.fdt.getprop(node, 'compatible'))

# Check that this property is missing, and that we don't have space to
# add it
self.assertEquals(-libfdt.NOTFOUND,
self.fdt.getprop(node, 'missing', QUIET_NOTFOUND))
self.assertEquals(-libfdt.NOSPACE,
self.fdt.setprop(node, 'missing', TEST_STRING_1,
self.fdt.setprop(node, 'missing', TEST_BYTES_1,
quiet=(libfdt.NOSPACE,)))

# Expand the device tree so we now have room
self.fdt.resize(self.fdt.totalsize() + 50)
self.fdt.setprop(node, 'missing', TEST_STRING_1)
self.assertEquals(TEST_STRING_1, self.fdt.getprop(node, 'missing'))
self.fdt.setprop(node, 'missing', TEST_BYTES_1)
self.assertEquals(TEST_BYTES_1, self.fdt.getprop(node, 'missing'))

def testSetPropU32(self):
"""Test that we can update and create integer properties"""