From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Sun, 16 Apr 2017 20:22:23 -0600 Subject: [U-Boot] [PATCH 09/19] fdt: Update fdt_test to use 'dt' instead of 'fdt' In-Reply-To: <20170417022233.28101-1-sjg@chromium.org> References: <20170417022233.28101-1-sjg@chromium.org> Message-ID: <20170417022233.28101-10-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- tools/binman/fdt_test.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 at 0') + def _DeleteProp(self, dt): + node = dt.GetNode('/microcode/update at 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 at 0', 'data') + dt = FdtScan(fname, True) + dt.GetProp('/microcode/update at 0', 'data') self.assertEqual('fred', - fdt.GetProp('/microcode/update at 0', 'none', default='fred')) + dt.GetProp('/microcode/update at 0', 'none', default='fred')) self.assertEqual('12345678 12345679', - fdt.GetProp('/microcode/update at 0', 'data', typespec='x')) - self._DeleteProp(fdt) + dt.GetProp('/microcode/update at 0', 'data', typespec='x')) + self._DeleteProp(dt) -- 2.12.2.762.g0e3151a226-goog