valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,213 Commits 24 Branches 182 Tags 341 MiB
6d5babfa5c
Commit Graph

584 Commits

Author SHA1 Message Date
Jack Kuan
9c35844c56 Make pydsl work with stateconf. 
- Added implicit ordering to pydsl.(turned on via __pydsl__.set(ordered=True))

- Fixed a KeyError bug in stateconf renderer that happens during id renaming.

- The stateconf renderer now generates a no-op start state as the
  "first" state in a sls file.(enabled via -s)

- Made the stateconf renderer take high state input via the new -p
  option, so we can pipe pydsl output into it.

- Added more and fixed some test cases for stateconf and pydsl.
 2013-01-18 12:34:56 -05:00
Thomas S Hatch
a1de80e5c6 Merge pull request #3257 from mjarco/fix-local-jinja-template-resolution 
Fix jinja template includes lookup with salt-call --local mode
 2013-01-15 11:03:54 -08:00
Jack Kuan
791ca1cb44 Add test cases and fixed some corner cases. 2013-01-14 23:29:35 -05:00
Jack Kuan
a8b8a6eb18 Add a test module for pydsl and some bug fixes. 2013-01-14 23:29:35 -05:00
Michał Jarco
7f782afb14 Fixed jinja_tests. 
File roots contains lists of paths for each env.
 2013-01-14 08:58:27 +01:00
Thomas S Hatch
ad63c17227 overcome value error in win status test 2013-01-13 00:09:28 -07:00
Pedro Algarvio
c20cb1da51 Fix logging unit tests. Thanks @shadowfax-chc. 2013-01-08 03:41:59 +00:00
Pedro Algarvio
f8073a08eb Warn about low mock version instead of mock not available. 2013-01-04 17:45:06 +00:00
László Vaskó
7ff2ab7d58 win_status_test: added pid explicitly 2012-12-31 11:45:54 +01:00
László Vaskó
d6d9e9ce47 win_status: finalize COM library properly 2012-12-31 11:45:54 +01:00
László Vaskó
51150f1427 win_status: handle if CommandLine is None 2012-12-31 11:45:54 +01:00
Thomas S Hatch
a601af6955 Merge pull request #3071 from s0undt3ch/hotfix/pylint/C0103 
Fixes for pylint's C0103 msgid
 2012-12-30 20:22:42 -08:00
Thomas S Hatch
66ae9bcc67 Merge pull request #3080 from vlaci/master 
'status.procs' function implementation and tests for windows
 2012-12-30 20:03:07 -08:00
László Vaskó
ecef344c61 Added 'status.procs' function for windows 2012-12-31 01:34:38 +01:00
Pedro Algarvio
d8d9d14d5a Fix the stateconf unit test. Refs #1775 2012-12-29 22:19:17 +00:00
Ryan Schneider
8f8cc74b34 Some minor cleanup of unit and integration tests. 2012-12-18 17:39:16 -08:00
Thomas S Hatch
9d427c868d Merge pull request #2861 from s0undt3ch/hotfix/headers 
Header updates. More copyright to the SaltSatck team. Code author to me(where applicable).
 2012-12-11 04:50:37 -08:00
Pedro Algarvio
64a0d631e1 Fix rvm unit tests. 2012-12-11 11:27:21 +00:00
Pedro Algarvio
7c5a5d0bd3 Header updates. More copyright to the SaltSatck team. Code author to me(where applicable). 2012-12-11 10:23:37 +00:00
Pedro Algarvio
8d092afddc Don't assume digits in logging format strings. Refs #2859, fixes #2853. 
Sorry @ryanschneider for stepping in on your fix.

Nothing is assumed now, and several checks are made. If any of the checks fail, nothing else is done in `salt.log.Logging.__new__()`.
Added a test case which will take care of possible regressions on this bug fix.
 2012-12-11 10:10:03 +00:00
Henrik Holmboe
5bcce96761 Update import in unit test. 
https://travis-ci.org/holmboe/salt/jobs/3563157
 2012-12-08 10:37:26 +01:00
Henrik Holmboe
a607016198 Update import in unit test. 
https://travis-ci.org/holmboe/salt/jobs/3563086
 2012-12-08 09:44:51 +01:00
Jeroen Dekkers
c123d8f824 Preserve the final newline in Jinja templates 2012-12-02 19:45:09 +01:00
Jack Kuan
190f4bd828 Fix a case when a single shorthand state is declared without arguments. 
Also, now automatically adds the name argument, if one is not provided,
for states declared under a dot-prefixed state id.
 2012-11-18 22:02:24 -05:00
Pedro Algarvio
c5fe83272f Even more open() to salt.utils.fopen(). 2012-11-18 18:57:10 +00:00
Pedro Algarvio
bed55506c3 Proper OrderedDict check. 2012-11-17 01:19:37 +00:00
Pedro Algarvio
89fd313766 Fix stateconf test failing in 2.6 because OrderedDict was not available. 2012-11-16 22:45:12 +00:00
John Debs
4a062f1e69 Logic and test fixes for version, ri, rdoc support in gem state 2012-11-15 18:05:06 -05:00
Thomas S Hatch
326904e020 An easy fix on opening files 2012-11-13 20:55:40 -07:00
Jack Kuan
7f3ac3fe89 Add some docs on render pipe. 
Also, added a stateconf state so that its stateconf.set function
can be used by the stateconf renderer.
 2012-11-13 02:01:34 -05:00
Jack Kuan
a76331e0e1 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-11-13 00:58:04 -05:00
Thomas S Hatch
6fce0a2353 Minor fixes for stateconf tests and sting updates 2012-11-12 22:20:37 -07:00
Jack Kuan
db451d5ed3 Update jinja template unit tests and remove obsolete salt.utils.jinja.get_template(). 2012-11-12 17:08:14 -05:00
Jack Kuan
7ad98acfb4 Fix stateconf unit test and the problem with sls_dir==''. 2012-11-12 00:50:46 -05:00
Jack Kuan
8cb70d0a6e Update stateconf renderer module doc and revert names declaration support. 2012-11-12 00:16:03 -05:00
Jack Kuan
f1c49d6efd Minor update to a test case. 2012-11-08 02:00:54 -05:00
Jack Kuan
f921e91377 Add unit tests for the stateconf renderer. 
Also fixed a few bugs in the stateconf renderer.
 2012-11-08 01:46:03 -05:00
Pedro Algarvio
ae7e476bfc Handle some quoting issues while building the whitespace regex for file.append. Fixes #2227. 2012-10-12 11:45:27 +01:00
Thomas S Hatch
7a5cead786 this is 5 now... 2012-10-06 22:59:42 -06:00
Thomas S Hatch
5aa1e847b6 update tests for changes in directory perms 2012-10-06 22:53:04 -06:00
Morgan Fainberg
7800157e37 Fix the test for jinja, local (non salt:// files) now can support {% include %} 2012-09-27 14:55:55 -07:00
Pedro Algarvio
6640e9581d Merge branch 'develop' of github.com:saltstack/salt into develop 2012-09-20 19:29:49 +01:00
Pedro Algarvio
39af3fb5d6 Fix the test-cases custom logging handler. 
* Even when the tests logging handler stream is directed to `/dev/null` we still need a low logging level so that our custom logging handler, used to see if certain log messages are emitted or not, catches messages.
 2012-09-20 19:27:32 +01:00
Thomas S Hatch
6de9939768 Fix another test for new hased minion ids 2012-09-19 14:39:01 -06:00
Thomas S Hatch
a3e7a3a7af fix test based on new minion event socket names 2012-09-19 14:21:56 -06:00
Pedro Algarvio
243edfb9ad Also test for not triggering log messages. Refs #1986. 2012-09-16 16:27:17 +01:00
Pedro Algarvio
969dc01ce1 Skip test on travis-ci environment. Refs #1986. 2012-09-16 16:12:17 +01:00
Pedro Algarvio
b445674d98 Skip test if max open files exception is triggered. 2012-09-16 16:00:36 +01:00
Pedro Algarvio
0fd61050c9 Inform the users about the current max open files situation. 
We defined that the amount of accepted keys should be lower than 1/4 of the system's max open file setting. Inform the user about the current situation, the logging level is "attached" to the gravity of the current status.
 2012-09-15 15:32:07 +01:00
Pedro Algarvio
4f9e62eaf4 Include a test case. Fixes #1989. 2012-09-07 18:04:14 +01:00
Pedro Algarvio
174f3d6d19 Fix the tests related to saltstack/salt#1900 2012-09-01 05:06:44 +01:00
Pedro Algarvio
ed7878e7c8 Fix saltstack/salt#1900 
* Minor typo.
* Fix MinionEvent getting 'id' from kwargs and not getting the proper default value.
* And some unittest about this issue.
 2012-08-31 01:20:32 +01:00
Thomas S Hatch
34829cd046 Clean up unused imports and variables 2012-08-30 14:14:02 -06:00
Thomas S Hatch
511eb57fdd remove unused import 2012-08-30 13:26:35 -06:00
Thomas S Hatch
f68816ed47 Remove unused import 2012-08-30 13:25:17 -06:00
Pedro Algarvio
8b645b339b Fix #1879. Searching/matching is now done on multiple lines. 
* `salt.modules.file.contains()`, `salt.modules.file.contains_regex()`, `salt.modules.file.contains_glob()` and `salt.utils.find` now do the searching/matching against chunks of data; using defaults, 32KB chunks of data in files; instead of searching/matching line by line.
* Based on the above changes `salt.states.file.append()`, when checking if the text to append is already present, now uses `salt.modules.file.contains_regex()` in order to match spanning multiple lines ignoring the addition/deletion of white-space or new lines, except inside commas.
* The regex used on the above item is built at runtime using `salt.utils.build_whitepace_splited_regex()`, just feed the text to it and you'll get back the proper regex to the matching/searching on, for example `salt.modules.file.contains_regex()`.
* Added tests for all this code.
 2012-08-28 10:03:11 +01:00
Pedro Algarvio
9dfce0f7d2 Final fix for saltstack/salt#1756 
Don't try to import `salt.log` during tests. Adapt `check_user` test accordingly.
 2012-08-11 01:28:49 +01:00
Pedro Algarvio
1cae292c68 Fix tests/unit/utils/verify_test.py since verify_user no longer accepts the log argument. 2012-08-11 00:30:13 +01:00
Pedro Algarvio
639471d110 Multi-platform path joiner(appender) 
This commit kind of reverts the previous "no more os.sep.join ..." commit by solving the issue which led to switching that code to `os.path.join`. Tested both on linux and windows.
 2012-08-08 14:43:34 +01:00
Pedro Algarvio
759d67ffc0 Reverted back the --key-logfile deprecation. 
On the parsers cleanup branch, I though about making the available options as equal as possible. Since the log_file setting for the master and the minion could be separately set,  I made the logfile option for the key also log_file. Yet, since there's no key specific config file, it shares master, one could only specify the log_file settings from the cli,   it could not be hardcoded on the config file, unless, we made a separate config file just for key.
So, in order to reduce required changes, and keep it all as backwards compatible as possible, the key log file options is now, once again, `--key-logfile` which will allow us to   hardcode it in the masters config file as `key_logfile`.
This will also, hopefully make travis behave better too.
 2012-08-08 01:08:38 +01:00
Intchanter
3c05a3ee78 Merge branch 'develop' of https://github.com/saltstack/salt into develop 
Conflicts:
	tests/integration/modules/grains.py
	tests/integration/states/host.py
	tests/unit/utils/find_test.py
 2012-07-04 18:29:13 -06:00
Intchanter
49b2465cf0 Cleaned up syntax error 2012-07-04 17:42:53 -06:00
Dan Colish
aacd9cc5bd Use getpass.getuser since os.getlogin requires a tty and tests do not 
always run with one.
 2012-06-30 23:31:01 -07:00
Dan Colish
040c249866 Fix find_test on OSX 2012-06-30 15:23:50 -07:00
Jeff Hutchins
b380991316 Merge git://github.com/saltstack/salt into tests 
Conflicts:
	tests/unit/utils/find_test.py
 2012-06-30 15:58:17 -06:00
Dan Colish
1b1431ba66 Skip verify_env test on windows. 2012-06-30 14:11:37 -07:00
Jeff Hutchins
ff54029c98 Make tests on utils.find run with nose. 2012-06-30 14:48:40 -06:00
Dan Colish
01b74fc04c Add unittests for salt.utils.verify 2012-06-30 13:28:15 -07:00
Intchanter
a1433ef5ec PEP8 fixes for tests 2012-06-30 14:10:34 -06:00
Dan Colish
edfb3d2560 Merge branch 'develop' of git://github.com/saltstack/salt into develop 
Conflicts:
	tests/unit/utils/find_test.py
 2012-06-30 12:46:04 -07:00
Jeff Schroeder
07b4c8b4ed Skip the rvm and gem module/state tests when mock is missing 
The mock python module is required for the gem and rvm tests.
If it is not available, the tests should be gracefully skipped.

From python runtests.py -u:

test__check_and_install_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_ruby (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test__check_rvm (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_gemset_present (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.rvm_test.TestRvmState) ... skipped 'mock python module is unavailable'
test_installed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test_removed (unit.states.gem_test.TestGemState) ... skipped 'mock python module is unavailable'
test__rvm (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__rvm_do (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_gemset_list_all (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_install (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.rvm_test.TestRvmModule) ... skipped 'mock python module is unavailable'
test__gem (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
test_sources_list (unit.modules.gem_test.TestGemModule) ... skipped 'mock python module is unavailable'
 2012-06-30 12:29:48 -07:00
Dan Colish
78d16a28f0 Move tmp hosts file management to test case which requires it. Fix 
test.unit.utils.find_test on OSX
 2012-06-30 12:20:53 -07:00
David Boucha
7e7d831103 Disable find unit tests on Windows 
There are problems with pwd, grp and /dev/null
as they don't exist on Windows. So we are disabling
tests that use those for now.
 2012-06-24 19:43:43 -06:00
David Boucha
bb72a4dfba Fix jinja_test on Windows 2012-06-24 18:16:22 -06:00
Jeroen Dekkers
92ffbaba6e Be compatible with mock 0.7 2012-06-19 02:19:03 +02:00
Baiju Muthukadan
8cc8fe7305 use sys.maxint for platform compatibility 
Also comment out a failing test case.  This works in CentOS 6.2 32bit
but not working unde Ubuntu 12.04 32bit.
 2012-06-18 12:06:54 +05:30
Baiju Muthukadan
ea4c519e25 tests for find utility 2012-06-18 00:54:48 +05:30
L.C. Rees
140e8781df - py3k updates 2012-05-31 23:31:27 -06:00
Dan Colish
f5c8e242e4 Refactor runtests to allow dotted path module discovery. 
In addition to traditional file system path test discovery it is
useful to run a test by stating it's dotted python path. For example,
this will only run the cmdmod integration tests from the
module suite::

        $ runtests.py -n tests.integration.modules.cmdmod
 2012-05-29 19:56:47 -07:00
Baiju Muthukadan
24bb4ea4e0 Fix PEP8 warnings for test cases 2012-05-29 22:10:20 +05:30
Jeff Schroeder
6f836afafa Remove a few instances of hardcoded /tmp in code 
tempfile.gettempdir() is way better. The gem and rvm states are
still failing, but only because they require the "mock" python
module for running their tests.
 2012-05-09 21:29:05 -07:00
Anselm Helbig
d02f0beaee added proper unit tests for gem and rvm modules and states; fixed bugs in the rvm module's install function and in the rvm state's handling of ruby versions 2012-05-03 11:33:16 +02:00
Anselm Helbig
5bc9ea7d67 added preliminary unit tests for rvm module 2012-05-02 09:42:01 +02:00
Eivind Uggedal
ab7ace6aa5 Split out integration tests from pure unit tests. 
Integration tests requiring a salt master and daemon were seperated
from pure unit tests. For now both are run with runtest.py. In
the future it could take arguments for which type of tests to run.
 2012-02-20 13:18:13 +01:00