Thomas S Hatch
aa584dc255
Add ret value to test return data
2013-10-15 17:05:04 -06:00
Thomas S Hatch
ca0e967c13
Assign the ret value
2013-10-15 17:03:12 -06:00
Thomas S Hatch
6bc5ea34e9
Ensure that the ports are integers
2013-10-15 16:59:44 -06:00
Thomas S Hatch
8612f7c007
Add ref to ret in test_7754
2013-10-15 16:34:17 -06:00
Thomas S Hatch
52f2b0feb7
Merge pull request #7858 from s0undt3ch/issues/6714
...
Test for the presence of a yaml parsing log message. Fixes #6714 .
2013-10-15 15:08:56 -07:00
Thomas S Hatch
c12ef31f16
Merge pull request #7855 from s0undt3ch/develop
...
Avoid unnecessary `KeyError`'s while testing.
2013-10-15 15:07:26 -07:00
Pedro Algarvio
9caffa11e7
Test for the presence of a yaml parsing log message. Fixes #6714 .
...
Additionally, moved the yaml syntax error checking to the proper place.
2013-10-15 22:54:15 +01:00
Pedro Algarvio
1bf652541d
Avoid unnecessary KeyError
's while testing.
2013-10-15 22:42:21 +01:00
Colton Myers
3e565737c6
Merge pull request #7853 from s0undt3ch/issues/7754
...
Fix syslog logic checks for `file://`, `tcp://` and `udp://`. Fixes #7754
2013-10-15 14:22:43 -07:00
Pedro Algarvio
e72b4a3492
Fix syslog logic checks for file://
, tcp://
and udp://
. Fixes #7754 .
2013-10-15 22:09:37 +01:00
C. R. Oldham
8793429f72
Make sure that ssh keys don't get added with incorrect encoding types.
2013-10-15 11:48:28 -06:00
David Anderson
ec4475cf30
Fix issue 5951 - correct __opts__['file_roots'] in ext_pillars
2013-10-11 11:53:00 -06:00
Thomas S Hatch
98444b8169
Merge pull request #7750 from holmboe/pkill
...
Prettify subcommand to kill minions
2013-10-11 08:04:34 -07:00
Henrik Holmboe
4a48dc791b
Prettify subcommand to kill minions
...
I realize that this is just cosmetic change. And possibly that there is
a compatibility issue, if minionswarm is to be used on platforms that
don't have pkill.
2013-10-11 10:02:23 +02:00
David Anderson
25b0e3f89e
Restore the pillar[master][file_roots] when returning the pillar
2013-10-10 15:12:00 -06:00
Pedro Algarvio
30e747060d
Jinja needs to be "fed" Unicode data. Fixes #7576 .
...
Additionally, what's returned from `render_jinja_tmpl` is also a Unicode string to that the `SLS_ENCODER` can properly encode them. Encoding UTF-8 data as UTF-8 data using the `SLS_ENCODER` does not, of course, work.
2013-10-08 00:11:44 +01:00
Pedro Algarvio
a5a87ca1fc
Mimic the test case shown @ http://goo.gl/UI7uS8
2013-10-08 00:11:19 +01:00
Luper Rouch
db8eef8f32
Fixed empty file case in modules.file.append()
...
Lines are simply inserted at the beginning of the file for empty files.
2013-10-07 16:31:42 +02:00
Luper Rouch
e5631f2671
Checking for newline at EOF in modules.file.append()
2013-10-07 16:17:25 +02:00
Pedro Algarvio
8f0a19946d
Fix test_issue_6973_state_highstate_exit_code
.
2013-10-04 21:31:46 +01:00
Pedro Algarvio
c5082f2a77
Patch salt.utils.which
to fix Django tests.
...
After the check added in 8deefc16
, the django salt module integration test cases started to fail if the django administration script was not found in `$PATH`.
2013-10-04 19:07:11 +01:00
Pedro Algarvio
3c4f33a935
Adapt remaining test cases which relied on old versioning scheme.
2013-10-04 13:10:35 +01:00
Thomas S Hatch
bb0ca15ebc
Merge pull request #7187 from ajithhub/nics_as_list
...
Reorganize NIC Profiles as list of interfaces
2013-10-04 04:35:18 -07:00
Pedro Algarvio
1c191fb8bf
Support named version strings mathematical comparison.
2013-10-04 09:53:51 +01:00
Pedro Algarvio
738902b322
Update current deprecation messages to use named versions.
2013-10-04 09:53:51 +01:00
Pedro Algarvio
f0b78cd916
Format version
on deprecation messages.
...
Add a test case to check if a deprecation message get it's `version` format holder properly populated.
2013-10-04 09:53:51 +01:00
Pedro Algarvio
a9ceedb5eb
warn_until
and kwargs_warn_until
are now aware of named versions.
...
Updated the warnings tests cases accordingly.
2013-10-04 09:53:50 +01:00
Pedro Algarvio
8c9fe2c5c1
Fix the kwargs_warn_until
unit test case.
2013-10-04 09:53:50 +01:00
Pedro Algarvio
f028a004ad
Fix the warnings unit test.
...
Since the `warn_until` function now parses and instantiates a `SaltStackVersion`, the `bugfix` part of the version info is always shown.
2013-10-04 09:53:50 +01:00
Pedro Algarvio
800c918729
Let SaltStackVersion be the original one, not a MagicMock'ed one
2013-10-04 09:53:50 +01:00
Ajith Antony
b95a5d9fd0
Virt Template deploy, and serial xml tests
...
- Added virt templates to setup
- moved NIC xml string template to file
- added tests for serial xml
2013-10-03 13:21:34 -05:00
Pedro Algarvio
1a3c11c1ca
Logs download should be done in a separate step.
2013-10-03 18:49:34 +01:00
Ajith Antony
c7ae3ba592
Nic profile changes
...
- Implement 3 styles of profile definition
- Support both config.options and config.get
- Replaces NIC substituions with template
- xml unit tests fixed up
2013-10-03 12:06:19 -05:00
Ajith Antony
6ce3973c13
added main run to simple.py
2013-10-03 11:50:49 -05:00
Seth House
a4619a9c1c
Actually run the file.replace unit tests...
2013-10-03 09:28:32 -06:00
Pedro Algarvio
c8f1e457d7
Allow tests.integration.run_tests
to execute more than one TestCase
instance.
2013-10-03 16:09:57 +01:00
Pedro Algarvio
58b5a85b58
Some sleeping between commands.
2013-10-03 15:08:50 +01:00
Pedro Algarvio
67abab7b21
Set the VM name.
2013-10-03 13:36:08 +01:00
Pedro Algarvio
36e889b8ed
Support downloading remote logs in Jenkins.
2013-10-03 12:52:05 +01:00
Pedro Algarvio
cf7a0b6205
Don't trigger state events on pydsl unit tests.
2013-10-03 00:59:03 +01:00
Henrik Holmboe
baf46300fa
Remove unused import
...
We use ElementTree from salt._compat.
2013-10-02 16:17:19 +02:00
Henrik Holmboe
eea799c8c3
Specify reason for Python 2.7 requirement
...
While ElementTree is in Python 2.6, we need the expanded support
for xpath which was introduced in Python 2.7.
As discussed in #7264 , it might be possible to install
`elementtree-1.3a3-20070912` for Python 2.6, but this is yet untested.
2013-09-30 10:40:13 +02:00
Pedro Algarvio
516e304b96
Let's try if mocking fixes the intermittent failures of the unit test.
2013-09-28 23:50:30 +01:00
Pedro Algarvio
707385c1c1
Use the salt testing requires_salt_modules
decorator.
2013-09-28 18:57:38 +01:00
Pedro Algarvio
034d8f3a61
Skip tests if libvirt
is not importable.
2013-09-28 18:55:15 +01:00
Pedro Algarvio
e194a9fabe
Merge pull request #7494 from s0undt3ch/issues/7409-no-new-line-ssh-keys
...
Make sure there's a line break before writing new key
2013-09-28 03:07:43 -07:00
Pedro Algarvio
ec07e5ae49
Adapt test cases to fixed behaviour.
2013-09-28 00:00:59 +01:00
Pedro Algarvio
9b3d504e03
Fix unit tests regarding salt.utils.find._parse_interval
2013-09-28 00:00:59 +01:00
Pedro Algarvio
e7ddf159a1
Make sure there's a line break before writing new key. Fixes #7409 .
2013-09-28 00:00:26 +01:00
Pedro Algarvio
2f3ed58541
Add test case which verifies the occurrence of #7409 .
2013-09-28 00:00:25 +01:00