Commit Graph

68 Commits

Author SHA1 Message Date
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