From: Simon Glass Date: Sat, 27 May 2017 13:38:20 +0000 (-0600) Subject: fdt: Update fdt_test to use 'dt' instead of 'fdt' X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=1d88ebb2702d54f04ecda1899e43bb9fb06dad3a;p=u-boot.git fdt: Update fdt_test to use 'dt' instead of 'fdt' Since fdt is a module it conflicts with this variable name and prevents it being used in tests. Rename the variable. Signed-off-by: Simon Glass --- diff --git a/tools/binman/fdt_test.py b/tools/binman/fdt_test.py index 1d9494e52f..12edeaba6c 100644 --- a/tools/binman/fdt_test.py +++ b/tools/binman/fdt_test.py @@ -28,21 +28,21 @@ class TestFdt(unittest.TestCase): def GetCompiled(self, fname): return fdt_util.EnsureCompiled(self.TestFile(fname)) - def _DeleteProp(self, fdt): - node = fdt.GetNode('/microcode/update@0') + def _DeleteProp(self, dt): + node = dt.GetNode('/microcode/update@0') node.DeleteProp('data') def testFdtNormal(self): fname = self.GetCompiled('34_x86_ucode.dts') - fdt = FdtScan(fname) - self._DeleteProp(fdt) + dt = FdtScan(fname) + self._DeleteProp(dt) def testFdtFallback(self): fname = self.GetCompiled('34_x86_ucode.dts') - fdt = FdtScan(fname, True) - fdt.GetProp('/microcode/update@0', 'data') + dt = FdtScan(fname, True) + dt.GetProp('/microcode/update@0', 'data') self.assertEqual('fred', - fdt.GetProp('/microcode/update@0', 'none', default='fred')) + dt.GetProp('/microcode/update@0', 'none', default='fred')) self.assertEqual('12345678 12345679', - fdt.GetProp('/microcode/update@0', 'data', typespec='x')) - self._DeleteProp(fdt) + dt.GetProp('/microcode/update@0', 'data', typespec='x')) + self._DeleteProp(dt)