| Index: scripts/slave/unittests/annotated_run_test.py
|
| diff --git a/scripts/slave/unittests/annotated_run_test.py b/scripts/slave/unittests/annotated_run_test.py
|
| index df8d22f91247e4e4fa713d9d50de9c26b78f7f83..121f0f8d60168d0f4ffa5daf00ee0e3a18d1d573 100755
|
| --- a/scripts/slave/unittests/annotated_run_test.py
|
| +++ b/scripts/slave/unittests/annotated_run_test.py
|
| @@ -81,10 +81,15 @@ class AnnotatedRunExecTest(unittest.TestCase):
|
| self._patchers = []
|
| map(self._patch, (
|
| mock.patch('slave.annotated_run._run_command'),
|
| + mock.patch('slave.annotated_run._build_dir'),
|
| + mock.patch('slave.annotated_run._builder_dir'),
|
| mock.patch('os.path.exists'),
|
| - mock.patch('os.getcwd'),
|
| ))
|
|
|
| + # Mock build and builder directories.
|
| + annotated_run._build_dir.return_value = '/home/user/builder/build'
|
| + annotated_run._builder_dir.return_value = '/home/user/builder'
|
| +
|
| self.rt = robust_tempdir.RobustTempdir(prefix='annotated_run_test')
|
| self.basedir = self.rt.tempdir()
|
| self.tdir = self.rt.tempdir()
|
| @@ -95,16 +100,14 @@ class AnnotatedRunExecTest(unittest.TestCase):
|
| 'mastername': 'master.random',
|
| 'buildername': 'builder',
|
| }
|
| - self.cwd = os.path.join('home', 'user')
|
| self.rpy_path = os.path.join(env.Build, 'scripts', 'slave', 'recipes.py')
|
| self.recipe_args = [
|
| sys.executable, '-u', self.rpy_path, '--verbose', 'run',
|
| - '--workdir=%s' % (self.cwd,),
|
| + '--workdir=/home/user/builder/build',
|
| '--properties-file=%s' % (self._tp('recipe_properties.json'),),
|
| 'example/recipe']
|
|
|
| # Use public recipes.py path.
|
| - os.getcwd.return_value = self.cwd
|
| os.path.exists.return_value = False
|
|
|
| def tearDown(self):
|
|
|