Rather than having a few tests handle this themselves, create the
temporary directory in the setUp() method and remove it in tearDown().
This will make it easier to add more tests.
Only testOutput and testGit() actually need it, but it doesn't add to the
test time noticeably to do this for all tests in this file.
Signed-off-by: Simon Glass <sjg@chromium.org>
terminal.SetPrintTestMode()
self._col = terminal.Color()
terminal.SetPrintTestMode()
self._col = terminal.Color()
- def Make(self, commit, brd, stage, *args, **kwargs):
- global base_dir
+ self.base_dir = tempfile.mkdtemp()
+ if not os.path.isdir(self.base_dir):
+ os.mkdir(self.base_dir)
+
+ def tearDown(self):
+ shutil.rmtree(self.base_dir)
+ def Make(self, commit, brd, stage, *args, **kwargs):
result = command.CommandResult()
boardnum = int(brd.target[-1])
result.return_code = 0
result = command.CommandResult()
boardnum = int(brd.target[-1])
result.return_code = 0
boardnum == 4 and commit.sequence == 6):
result.return_code = commit.return_code
result.stderr = (''.join(commit.error_list)
boardnum == 4 and commit.sequence == 6):
result.return_code = commit.return_code
result.stderr = (''.join(commit.error_list)
- % {'basedir' : base_dir + '/.bm-work/00/'})
+ % {'basedir' : self.base_dir + '/.bm-work/00/'})
result.combined = result.stdout + result.stderr
return result
result.combined = result.stdout + result.stderr
return result
This does a line-by-line verification of the summary output.
"""
This does a line-by-line verification of the summary output.
"""
- global base_dir
-
- base_dir = tempfile.mkdtemp()
- if not os.path.isdir(base_dir):
- os.mkdir(base_dir)
- build = builder.Builder(self.toolchains, base_dir, None, 1, 2,
+ build = builder.Builder(self.toolchains, self.base_dir, None, 1, 2,
checkout=False, show_unknown=False)
build.do_make = self.Make
board_selected = self.boards.GetSelectedDict()
checkout=False, show_unknown=False)
build.do_make = self.Make
board_selected = self.boards.GetSelectedDict()
'\n'.join(expect).replace('\n', '\nw+'))
self.assertEqual(line.colour, col.MAGENTA)
'\n'.join(expect).replace('\n', '\nw+'))
self.assertEqual(line.colour, col.MAGENTA)
- shutil.rmtree(base_dir)
-
def _testGit(self):
"""Test basic builder operation by building a branch"""
def _testGit(self):
"""Test basic builder operation by building a branch"""
- base_dir = tempfile.mkdtemp()
- if not os.path.isdir(base_dir):
- os.mkdir(base_dir)
options = Options()
options.git = os.getcwd()
options.summary = False
options.jobs = None
options.dry_run = False
options = Options()
options.git = os.getcwd()
options.summary = False
options.jobs = None
options.dry_run = False
- #options.git = os.path.join(base_dir, 'repo')
+ #options.git = os.path.join(self.base_dir, 'repo')
options.branch = 'test-buildman'
options.force_build = False
options.list_tool_chains = False
options.branch = 'test-buildman'
options.force_build = False
options.list_tool_chains = False
options.keep_outputs = False
args = ['tegra20']
control.DoBuildman(options, args)
options.keep_outputs = False
args = ['tegra20']
control.DoBuildman(options, args)
- shutil.rmtree(base_dir)
def testBoardSingle(self):
"""Test single board selection"""
def testBoardSingle(self):
"""Test single board selection"""