mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge branch 'devel' of git://github.com/ansible/ansible into devel
* 'devel' of git://github.com/ansible/ansible: (2 commits) Fix tests for facter and the ansible_facts API. ...
This commit is contained in:
commit
730cc89c5b
3 changed files with 2 additions and 6 deletions
|
@ -22,6 +22,4 @@
|
|||
# facter
|
||||
# ruby-json
|
||||
|
||||
echo '{ "ansible_facts":'
|
||||
/usr/bin/facter --json
|
||||
echo '}'
|
||||
|
|
|
@ -18,6 +18,4 @@
|
|||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
echo '{ "ansible_facts":'
|
||||
/usr/bin/ohai
|
||||
echo '}'
|
|
@ -85,7 +85,7 @@ class TestRunner(unittest.TestCase):
|
|||
if not get_binary("facter"):
|
||||
raise SkipTest
|
||||
result = self._run('facter',[])
|
||||
assert "hostname" in result['ansible_facts']
|
||||
assert "hostname" in result
|
||||
|
||||
# temporarily disbabled since it occasionally hangs
|
||||
# ohai's fault, setup module doesn't actually run this
|
||||
|
@ -95,7 +95,7 @@ class TestRunner(unittest.TestCase):
|
|||
# if not get_binary("facter"):
|
||||
# raise SkipTest
|
||||
# result = self._run('ohai',[])
|
||||
# assert "hostname" in result['ansible_facts']
|
||||
# assert "hostname" in result
|
||||
|
||||
def test_copy(self):
|
||||
# test copy module, change trigger, etc
|
||||
|
|
Loading…
Reference in a new issue