diff options
| author | Rémi Duraffort <remi.duraffort@linaro.org> | 2018-07-16 09:48:12 +0200 |
|---|---|---|
| committer | Neil Williams <neil.williams@linaro.org> | 2018-07-16 08:27:15 +0000 |
| commit | 138f35d75fb6a91c282086c7a7fe006beefd87c9 (patch) | |
| tree | 1fc3da6745e4ee9dd744b53fba76036280a41e60 | |
| parent | b89a515573ccbeebfa1a0649aaa5b2492dac4ec5 (diff) | |
Fix bzr tests
When most env variables are unset, bzr can't determine the current commiter, so
this should be set manually.
Change-Id: Ie2efbf0976af540ebd70150e3a0b791126357b4f
| -rw-r--r-- | lava_dispatcher/test/test_utils.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lava_dispatcher/test/test_utils.py b/lava_dispatcher/test/test_utils.py index ca85a2036..0e016d0da 100644 --- a/lava_dispatcher/test/test_utils.py +++ b/lava_dispatcher/test/test_utils.py @@ -141,19 +141,25 @@ class TestBzr(StdoutTestCase): # pylint: disable=too-many-public-methods # Go into a temp dirctory self.tmpdir = tempfile.mkdtemp() os.chdir(self.tmpdir) - self.env = {'BZR_HOME': self.tmpdir, 'BZR_LOG': self.tmpdir} + self.env = {'BZR_HOME': self.tmpdir, + 'BZR_LOG': os.path.join(self.tmpdir, "bzr.log")} # Create a Git repository with two commits - subprocess.check_output(['bzr', 'init', 'repo'], env=self.env, stderr=subprocess.STDOUT) + subprocess.check_output(['bzr', 'init', 'repo'], + env=self.env, stderr=subprocess.STDOUT) os.chdir('repo') + subprocess.check_output(['bzr', 'whoami', 'lava-ci@example.com'], + env=self.env, stderr=subprocess.STDOUT) with open('test.txt', 'w') as datafile: datafile.write("Some data") - subprocess.check_output(['bzr', 'add', 'test.txt'], env=self.env, stderr=subprocess.STDOUT) + subprocess.check_output(['bzr', 'add', 'test.txt'], + env=self.env, stderr=subprocess.STDOUT) subprocess.check_output(['bzr', 'commit', 'test.txt', '-m', 'First commit'], env=self.env, stderr=subprocess.STDOUT) with open('second.txt', 'w') as datafile: datafile.write("Some more data") - subprocess.check_output(['bzr', 'add', 'second.txt'], stderr=subprocess.STDOUT) + subprocess.check_output(['bzr', 'add', 'second.txt'], + env=self.env, stderr=subprocess.STDOUT) subprocess.check_output(['bzr', 'commit', 'second.txt', '-m', 'Second commit'], env=self.env, stderr=subprocess.STDOUT) |