ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge branch 'devel' of git://github.com/ansible/ansible into devel

Browse source 
* 'devel' of git://github.com/ansible/ansible: (2 commits)
  Fix tests for facter and the ansible_facts API.
  ...
This commit is contained in:
Seth Vidal 2012-04-24 11:15:24 -04:00
commit 730cc89c5b
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/facter
View file

@ -22,6 +22,4 @@
# facter # facter
# ruby-json # ruby-json
echo '{ "ansible_facts":'
/usr/bin/facter --json /usr/bin/facter --json
echo '}'

2
library/ohai
View file

@ -18,6 +18,4 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
# #
echo '{ "ansible_facts":'
/usr/bin/ohai /usr/bin/ohai
echo '}'

4
test/TestRunner.py
View file

@ -85,7 +85,7 @@ class TestRunner(unittest.TestCase):
if not get_binary("facter"): if not get_binary("facter"):
raise SkipTest raise SkipTest
result = self._run('facter',[]) result = self._run('facter',[])
assert "hostname" in result['ansible_facts'] assert "hostname" in result
# temporarily disbabled since it occasionally hangs # temporarily disbabled since it occasionally hangs
# ohai's fault, setup module doesn't actually run this # ohai's fault, setup module doesn't actually run this
@ -95,7 +95,7 @@ class TestRunner(unittest.TestCase):
# if not get_binary("facter"): # if not get_binary("facter"):
# raise SkipTest # raise SkipTest
# result = self._run('ohai',[]) # result = self._run('ohai',[])
# assert "hostname" in result['ansible_facts'] # assert "hostname" in result
def test_copy(self): def test_copy(self):
# test copy module, change trigger, etc # test copy module, change trigger, etc