diff options
| author | willthames <will@musc.org.uk> | 2012-07-30 11:59:29 +1000 |
|---|---|---|
| committer | Will Thames <will@musc.org.uk> | 2012-07-30 21:39:58 +1000 |
| commit | 1bcba4f4a2db9e66db5a8a14a3c2150bb9dc41bf (patch) | |
| tree | 3c3ddc0dfa04c3ec88dc8029e41304407cc58f9a /test | |
| parent | f5e08158cabaf1c538c8d0ff3a906f3a1c579765 (diff) | |
| download | ansible-1bcba4f4a2db9e66db5a8a14a3c2150bb9dc41bf.tar.gz | |
test/TestRunner.py now executes false with no directory prefix
as it is /bin/false on many systems but /usr/bin/false on OS X
test/playbook1.yml now just does command true, rather than command /bin/true,
again so that it works on OS X
Changed from using which false to just using command false to
make it simpler and also match how playbook1.yml works
Diffstat (limited to 'test')
| -rw-r--r-- | test/TestRunner.py | 2 | ||||
| -rw-r--r-- | test/playbook1.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/TestRunner.py b/test/TestRunner.py index ed429683ed..cd964daaae 100644 --- a/test/TestRunner.py +++ b/test/TestRunner.py @@ -128,7 +128,7 @@ class TestRunner(unittest.TestCase): assert result['stdout'] == 'hi' assert result['stderr'] == '' - result = self._run('command', [ "/bin/false" ]) + result = self._run('command', [ "false" ]) assert result['rc'] == 1 assert 'failed' not in result diff --git a/test/playbook1.yml b/test/playbook1.yml index 9778bd6c87..bd98e036be 100644 --- a/test/playbook1.yml +++ b/test/playbook1.yml @@ -18,10 +18,10 @@ tasks: - name: test basic success command - action: command /bin/true + action: command true - name: test basic success command 2 - action: command /bin/true + action: command true - name: test basic shell, plus two ways to dereference a variable action: shell echo $HOME $port {{ port }} |