From c1aa66e75dbfcacab1fbca0e3e19c09e08d932d5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 29 Jan 2022 14:14:04 -0700 Subject: patman: Convert camel case in tools.py Convert this file to snake case and update all files which use it. Signed-off-by: Simon Glass --- tools/buildman/func_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/buildman/func_test.py') diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index c2e0b0b5c62..b92081863e6 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -422,7 +422,7 @@ class TestFunctional(unittest.TestCase): if arg.startswith('O='): out_dir = arg[2:] fname = os.path.join(cwd or '', out_dir, 'u-boot') - tools.WriteFile(fname, b'U-Boot') + tools.write_file(fname, b'U-Boot') if type(commit) is not str: stderr = self._error.get((brd.target, commit.sequence)) if stderr: -- cgit v1.2.3 From d98006997c342435f906317758292fe97c520b47 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 29 Jan 2022 14:14:05 -0700 Subject: patman: Convert camel case in command.py Convert this file to snake case and update all files which use it. Signed-off-by: Simon Glass --- tools/buildman/func_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/buildman/func_test.py') diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index b92081863e6..4beca8aa7d0 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -217,7 +217,7 @@ class TestFunctional(unittest.TestCase): self._toolchains.Add('gcc', test=False) def _RunBuildman(self, *args): - return command.RunPipe([[self._buildman_pathname] + list(args)], + return command.run_pipe([[self._buildman_pathname] + list(args)], capture=True, capture_stderr=True) def _RunControl(self, *args, boards=None, clean_dir=False, @@ -407,7 +407,7 @@ class TestFunctional(unittest.TestCase): stage: Stage that we are at (mrproper, config, build) cwd: Directory where make should be run args: Arguments to pass to make - kwargs: Arguments to pass to command.RunPipe() + kwargs: Arguments to pass to command.run_pipe() """ self._make_calls += 1 if stage == 'mrproper': -- cgit v1.2.3 From 0157b187f45c00ffb3e85c7f5c33808454243608 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 29 Jan 2022 14:14:11 -0700 Subject: patman: Convert camel case in gitutil.py Convert this file to snake case and update all files which use it. Signed-off-by: Simon Glass --- tools/buildman/func_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/buildman/func_test.py') diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 4beca8aa7d0..b48dd1671d9 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -267,11 +267,11 @@ class TestFunctional(unittest.TestCase): def testGitSetup(self): """Test gitutils.Setup(), from outside the module itself""" command.test_result = command.CommandResult(return_code=1) - gitutil.Setup() + gitutil.setup() self.assertEqual(gitutil.use_no_decorate, False) command.test_result = command.CommandResult(return_code=0) - gitutil.Setup() + gitutil.setup() self.assertEqual(gitutil.use_no_decorate, True) def _HandleCommandGitLog(self, args): -- cgit v1.2.3 From 098b10fb34140f4ac37cfab9c9afade9135710a8 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sat, 29 Jan 2022 14:14:18 -0700 Subject: patman: Convert camel case in terminal.py Convert this file to snake case and update all files which use it. Signed-off-by: Simon Glass --- tools/buildman/func_test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/buildman/func_test.py') diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index b48dd1671d9..6fcceb0ea56 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -205,8 +205,8 @@ class TestFunctional(unittest.TestCase): self._test_branch = TEST_BRANCH # Avoid sending any output and clear all terminal output - terminal.SetPrintTestMode() - terminal.GetPrintTestLines() + terminal.set_print_test_mode() + terminal.get_print_test_lines() def tearDown(self): shutil.rmtree(self._base_dir) @@ -438,7 +438,7 @@ class TestFunctional(unittest.TestCase): print(len(lines)) for line in lines: print(line) - #self.print_lines(terminal.GetPrintTestLines()) + #self.print_lines(terminal.get_print_test_lines()) def testNoBoards(self): """Test that buildman aborts when there are no boards""" @@ -450,7 +450,7 @@ class TestFunctional(unittest.TestCase): """Very simple test to invoke buildman on the current source""" self.setupToolchains(); self._RunControl('-o', self._output_dir) - lines = terminal.GetPrintTestLines() + lines = terminal.get_print_test_lines() self.assertIn('Building current source for %d boards' % len(boards), lines[0].text) @@ -463,7 +463,7 @@ class TestFunctional(unittest.TestCase): """Test that missing toolchains are detected""" self.setupToolchains(); ret_code = self._RunControl('-b', TEST_BRANCH, '-o', self._output_dir) - lines = terminal.GetPrintTestLines() + lines = terminal.get_print_test_lines() # Buildman always builds the upstream commit as well self.assertIn('Building %d commits for %d boards' % -- cgit v1.2.3