diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-16 19:11:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-16 19:11:12 +0000 |
| commit | 6bfd2c7990650475cf10d0903ae79cf8fb67dfff (patch) | |
| tree | 3427891d867aae5971836386d74cfa72e4ef70df | |
| parent | e57e4086ae399762ca4a9486afd76b0dc758d027 (diff) | |
| parent | bfd5819ab41bbb240a62fdc702077d053d505b75 (diff) | |
Merge "use env to find 'false'. Fix for OS X"
| -rw-r--r-- | nova/tests/test_utils.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py index d2b122121..1367dd841 100644 --- a/nova/tests/test_utils.py +++ b/nova/tests/test_utils.py @@ -79,13 +79,14 @@ exit 1 def test_unknown_kwargs_raises_error(self): self.assertRaises(exception.Error, utils.execute, - '/bin/true', this_is_not_a_valid_kwarg=True) + '/usr/bin/env', 'true', + this_is_not_a_valid_kwarg=True) def test_check_exit_code_boolean(self): - utils.execute('/bin/false', check_exit_code=False) + utils.execute('/usr/bin/env', 'false', check_exit_code=False) self.assertRaises(exception.ProcessExecutionError, utils.execute, - '/bin/false', check_exit_code=True) + '/usr/bin/env', 'false', check_exit_code=True) def test_no_retry_on_success(self): fd, tmpfilename = tempfile.mkstemp() |