Commit Graph

21 Commits (74f4d186cc7816bde8b803d9c524be473ea00890)

Author SHA1 Message Date
James Cammarata 4e5eb7559e Merge branch 'svg_and_inventory_refactor' into devel 11 years ago
Dan Slimmon 6ad09f1825 Added test for regex grouping bug fixed in 307a3e 11 years ago
James Cammarata d8a7b49b59 Merge branch 'inventorytree' of https://github.com/sergevanginderachter/ansible into sergevanginderachter-inventorytree 11 years ago
Kevin Bell bcfef8d0d4 Add a broken test that shows extensions not skipped 11 years ago
Taylor Barstow 154055e9ff Fixing expectations in test_dir_inventory_groups_for_host 11 years ago
Taylor Barstow 9ed7717634 Adding unit tests for host groups with inventory dir 11 years ago
Serge van Ginderachter d3eaa1b79e InventoryDir: refactor logic
Make sure all hosts and groups are unique objects
and that those are referenced uniquely everywhere.
Also fixes test_dir_inventory unit tests which were broken after previous
patches.

	modified:   lib/ansible/inventory/dir.py
11 years ago
Oleg Bulatov f6a4c20cc0 Make parsing variables for hosts and groups more consistent
This commit allows to specify arrays in [group:vars] block.

Signed-off-by: Oleg Bulatov <oleg@bulatov.me>
11 years ago
Richard C Isaacson 913c855df4 Formatting cleanup.
Post merging of GH-5837 via GH-5749.
11 years ago
g-k-r dbad5d71c6 modifed test to use get_hosts instead of get_groups
closes #5749

Conflicts:
	test/units/TestInventory.py
11 years ago
g-k-r 6626cb0b3d add test same host in different files in dir
tests issue #5749
 same host defined in different groups which in turn are defined
 in different ini files in an inventory directory

Conflicts:
	test/units/TestInventory.py
11 years ago
Richard C Isaacson 16fe09eef8 Fixes related to uncommenting test_dir_inventory in TestInventory.
0. Uncomment the test.
1. Test fails.
2. Make vars unique per file in test inventory files.
3. Modify token addition to not ast.literal_eval(v) a variable containing a hash.
4. Modify vars to have an escape in test inventory file.
5. Catch exceptions explicitly. Any unknown exceptions should be a bug.
6. Test passes.
11 years ago
Richard C Isaacson b41d8106ff Revert "Merge pull request #6287 from risaacson/fix_hash_in_var"
This reverts commit a808287451, reversing
changes made to 6129ea7566.
11 years ago
Richard C Isaacson 22a1fb28d6 Minor cleanup. 11 years ago
g-k-r a3c36a6853 modifed test to use get_hosts instead of get_groups
closes #5749

Conflicts:
	test/units/TestInventory.py
11 years ago
g-k-r 23fee4b836 add test same host in different files in dir
tests issue #5749
 same host defined in different groups which in turn are defined
 in different ini files in an inventory directory

Conflicts:
	test/units/TestInventory.py
11 years ago
Richard C Isaacson 49bd8b0b35 Fix inventory for test_dir_inventory
It came up that fixing this unit test may relate to another ticket that is open. This work allows us to uncomment this unit test by fixing how we pars variables allowing a quoted variable to contain a '#'.

Work also went into cleaning up some of the test data to clarify what was working.

Lastly work went into cleaning up formatting so that the code is easily read.
11 years ago
Jesse Keating 0c2c37a47a Avoid range selection on empty groups
This prevents a traceback when the group is empty.
Fixes #6258
11 years ago
James Cammarata f23ccebbdc Merge branch 'issue_4620' of https://github.com/jimi-c/ansible into jimi-c-issue_4620 11 years ago
Michael DeHaan f0dd040377 reconnect unit tests to 'make tests' 11 years ago
Michael DeHaan 2177b773c8 Rename tests to test, use old directory name. 11 years ago