Pedro Algarvio
09cb137ec7
Revert "salt-call
does not support timeout
"
...
This reverts commit 20de21df07
.
2013-08-17 06:06:41 +01:00
Pedro Algarvio
2dd1cb2a83
Revert "Let's try to get the test suite output"
...
This reverts commit 1ab4b0ca7b
.
2013-08-17 06:06:29 +01:00
Pedro Algarvio
1ab4b0ca7b
Let's try to get the test suite output
2013-08-17 05:40:05 +01:00
Pedro Algarvio
20de21df07
salt-call
does not support timeout
2013-08-17 05:32:32 +01:00
Pedro Algarvio
d8b011d103
Make salt-cloud run our testrun state to get a streamed output
2013-08-17 05:26:33 +01:00
Pedro Algarvio
0c0751e793
Adapt the test case to the changes introduced in 7e9e889
2013-08-16 20:26:48 +01:00
Pedro Algarvio
2f750ed06c
Allow network related tests to be skipped if no network is available. Fixes #6710 .
2013-08-16 02:02:37 +01:00
Erik Johnson
945c3a22c8
allow cp.recv to fail integration.modules.sysmod.SysModuleTest
2013-08-14 20:29:31 -05:00
Erik Johnson
176ab16f40
adjust "CLI Example" test
2013-08-14 20:17:39 -05:00
Pedro Algarvio
a4ce13a285
The jenkins version of salt does not support log level on the salt binary.
2013-08-14 12:59:55 +01:00
Pedro Algarvio
2334ce41e6
Run salt and salt-cloud with debug logging.
2013-08-14 12:51:12 +01:00
Pedro Algarvio
1f02553ead
Some more information about the bootstrap process.
2013-08-14 12:49:40 +01:00
Pedro Algarvio
1068406ca5
Fixed integration.states.pip.PipStateTest.test_pip_installed_errors
error regex.
...
It was failing to match on FreeBSD.
2013-08-14 12:29:34 +01:00
Pedro Algarvio
a1cd0ef29d
Show what the salt function returned in case of assertion errors.
2013-08-14 00:35:58 +01:00
Pedro Algarvio
b51b5cfb9e
Flush stdout
and say which exit code was thrown.
2013-08-13 15:47:11 +01:00
Pedro Algarvio
fcc74d9c56
Exit if the bootstrap process did not succeed.
2013-08-13 15:33:03 +01:00
Pedro Algarvio
90d375d14e
If SHELL
is not in the environ, the error message is different.
2013-08-13 14:17:41 +01:00
Pedro Algarvio
1ad2ceb5e1
Flush print messages.
2013-08-13 11:55:17 +01:00
Pedro Algarvio
acc6286f8a
Revert "Allow pip based installations if necessary."
...
This reverts commit ffaad3dc84
.
2013-08-13 11:24:04 +01:00
Pedro Algarvio
8856c7a039
Dam! Missing import.
2013-08-13 10:38:37 +01:00
Pedro Algarvio
ffaad3dc84
Allow pip based installations if necessary.
2013-08-13 10:38:24 +01:00
Pedro Algarvio
32b2705cdd
No colored output from the bootstrap script.
2013-08-13 10:38:24 +01:00
Pedro Algarvio
9d711508f5
Skip running the test is not attached to a TTY.
2013-08-13 10:25:49 +01:00
Pedro Algarvio
93ab0e9e43
Flush test-suite output before running the cleanup code.
2013-08-13 09:58:01 +01:00
Thomas S Hatch
4808281594
freebsd uses wheel as well
2013-08-13 01:01:10 -06:00
Thomas S Hatch
bb45a8b9f2
sleep longer for grains test if first return is bad
2013-08-13 00:35:55 -06:00
Thomas S Hatch
33cdd9e760
Don't fail on valid order change
2013-08-13 00:32:32 -06:00
Thomas S Hatch
53f7227fdd
Add freebsd to grp covered platforms
2013-08-13 00:27:14 -06:00
Thomas S Hatch
7c54b25119
Revert "Revert nonblocking commands"
...
This reverts commit 5176b51b41
.
2013-08-12 22:54:47 -06:00
Thomas S Hatch
de53840457
Reduce test suite worker threads to 3, the peer system does not
...
need extra procs anymore
2013-08-12 22:33:59 -06:00
Thomas S Hatch
5176b51b41
Revert nonblocking commands
...
In an attempt to determine why all tests are failing when they pass
running the commands in the shell and used to pass
2013-08-12 22:00:58 -06:00
Thomas S Hatch
503d56d189
Add a 30 minute timeout to jenkins state run
...
This lowers the load on the jenkins server and is still accurate because the expected minion to return if finite
2013-08-12 10:32:55 -06:00
Pedro Algarvio
8a938c9a66
Workaround the stateconf
TypeError
exceptions under python 2.6
...
```python
Traceback (most recent call last):
File "/testing/tests/unit/stateconf_test.py", line 117, in test_state_prefix
''', sls='test')
File "/testing/tests/unit/stateconf_test.py", line 30, in render_sls
**kws.copy()
File "/testing/salt/renderers/stateconf.py", line 229, in render
data = process_sls_data(sls_templ, tmplctx)
File "/testing/salt/renderers/stateconf.py", line 114, in process_sls_data
argline=rt_argline.strip(), **kws
File "/testing/salt/renderers/jinja.py", line 41, in render
tmp_data.get('data', 'Unknown render error in jinja renderer')
SaltRenderError: Traceback (most recent call last):
File "/testing/salt/utils/templates.py", line 64, in render_tmpl
output = render_str(tmplstr, context, tmplpath)
File "/testing/salt/utils/templates.py", line 102, in render_jinja_tmpl
loader = JinjaSaltCacheLoader(opts, context['env'])
File "/testing/salt/utils/jinja.py", line 42, in __init__
self.searchpath = opts['file_roots'][env]
TypeError: list indices must be integers, not str
```
2013-08-12 13:55:03 +01:00
Pedro Algarvio
799ff82f02
The test case should be executed in the test virtualenv for proper cleanup.
2013-08-12 13:36:52 +01:00
Pedro Algarvio
11060c85be
Allow running a group of tests while still providing a test case name from another group.
2013-08-12 11:46:58 +01:00
Pedro Algarvio
0c9ed627ff
If no output, it's also a failure.
2013-08-11 19:22:30 +01:00
Pedro Algarvio
864a69661e
Match test suite exit code.
2013-08-11 17:20:43 +01:00
Pedro Algarvio
67a5138a9d
Stream jenkins output.
2013-08-11 13:58:42 +01:00
Pedro Algarvio
e902d7c403
Required options should error if not passed.
2013-08-11 12:44:54 +01:00
Chris Rebert
24e903e63a
tests/jenkins.py: fix URL; minor copyedits
2013-08-10 22:50:47 -07:00
Thomas S Hatch
6d4af97e17
put a sleep back on grains.setval test for new jenkins stuff
2013-08-10 22:33:02 -06:00
Thomas S Hatch
1370e72c30
Merge pull request #6555 from flupke/pillar_order2
...
Add support for order clauses in pillar top files
2013-08-10 21:13:20 -07:00
Thomas S Hatch
e40bd7e4f9
Always name vms with ZZZ in jankins tests
...
This makes it easier to see them all in the cloud lists
2013-08-10 14:16:55 -06:00
Thomas S Hatch
909edec564
Skip pydsl test without tty
2013-08-10 14:04:18 -06:00
Thomas S Hatch
7ac5b1d400
Always assign retcode
2013-08-10 13:55:18 -06:00
Pedro Algarvio
785188802f
Temporary directories should respect integration.SYS_TMP_DIR
...
Also, skip if the directory was not actually created.
2013-08-10 20:10:10 +01:00
Pedro Algarvio
8d35a82920
Skip test instead of returning.
2013-08-10 19:50:31 +01:00
Thomas S Hatch
b09114ec1d
avoid key error is not SHELL env var
2013-08-10 12:14:10 -06:00
Thomas S Hatch
1e27703f3b
PIPE on Popen
2013-08-10 09:33:24 -06:00
Thomas S Hatch
040fe7c943
Caps
2013-08-10 08:58:45 -06:00
Thomas S Hatch
1bdb939bbe
Add better detection of state errors
2013-08-10 08:33:19 -06:00
Thomas S Hatch
ebc8256ba2
pass in script args to install the testing commit
2013-08-10 08:21:54 -06:00
Thomas S Hatch
c4a79bbba2
pass through the retcode from the state call
2013-08-10 02:33:58 -06:00
Thomas S Hatch
c43af7cf6f
make it --no-clean
2013-08-10 02:06:03 -06:00
Thomas S Hatch
1970cbdce8
Allow builds to not clean up
2013-08-10 02:04:45 -06:00
Thomas S Hatch
b3461f7f06
escape braces from format
2013-08-10 01:53:28 -06:00
Thomas S Hatch
174a1ecdb5
Pass needed args to run funtion
2013-08-10 01:44:28 -06:00
Thomas S Hatch
4b862da662
dict is not callable :)
2013-08-10 01:43:40 -06:00
Thomas S Hatch
c225921821
Pass through the git commit to the pillar
2013-08-10 01:40:47 -06:00
Thomas S Hatch
1f17e10ef7
updates to jenkins test script
2013-08-10 01:23:32 -06:00
Thomas S Hatch
d50d438545
Add initial jenkins python script for jenkins tests
2013-08-10 01:15:30 -06:00
Pedro Algarvio
7b3ba67bc7
Fix the test_install_pre_argument_in_resulting_command
test case.
...
It now checks if the `--pre` output is present in versions >= 1.4 or not in versions < 1.4
2013-08-09 12:14:56 +01:00
Erik Johnson
113e5e9b52
Update assert in test_pip_installed_weird_install
...
Pull #6574 changed the state output slightly, breaking this test. This
commit fixes the test.
2013-08-08 18:43:44 -05:00
Luper Rouch
fafdfa1800
added support for order clauses in pillar top files
...
Conflicts:
tests/unit/pillar_test.py
2013-08-07 22:57:42 +02:00
Pedro Algarvio
305a5c2223
The parser destructive tests flag is now provided by salt-testing
2013-08-06 22:03:42 +01:00
Pedro Algarvio
2b0bc7056e
Under python 2.6 using {}.format()
(without an index) is a ValueError
.
2013-08-06 19:29:08 +01:00
Roberto Aguilar
74be66baca
Added tests for file.managed contents_pillar param
2013-08-04 22:09:37 -07:00
Pedro Algarvio
d6e0b2a5a2
Added unit test for list nested OrderedDict
's. Refs #6460 .
2013-08-01 01:34:37 +01:00
Joseph Hall
d539e6e8ff
Merge pull request #6433 from s0undt3ch/sprint/mock-salt.modules.archive
...
Complete the work started on the sprint for `salt.modules.archive`
2013-07-30 07:21:24 -07:00
Pedro Algarvio
fe1736bbcd
Fix the mocked test for archive.unrar
.
2013-07-30 06:14:13 +01:00
Pedro Algarvio
189bc4e45e
Added mocked tests for salt.modules.archive.unrar()
2013-07-30 05:36:19 +01:00
Pedro Algarvio
16c4057c4f
Added mocked tests for salt.modules.archive.zip()
. Excludes as a list
2013-07-30 05:01:39 +01:00
Pedro Algarvio
39d0006931
Added mocked tests for salt.modules.archive.unzip()
. Excludes as a list
2013-07-30 05:00:58 +01:00
Pedro Algarvio
34b22afad9
Added mocked tests for salt.modules.archive.rar()
2013-07-30 04:59:28 +01:00
Pedro Algarvio
1a7b68b1a3
Added mocked tests for salt.modules.archive.unzip()
2013-07-30 04:52:31 +01:00
Pedro Algarvio
2f2047aa47
Added mocked tests for salt.modules.archive.zip()
2013-07-30 04:22:02 +01:00
Pedro Algarvio
a7c7cca94e
Test if an exception is raised if the required binary is not found.
2013-07-29 23:29:58 +01:00
Thomas S Hatch
b2e41aceeb
Merge pull request #6402 from s0undt3ch/sprint/mock-salt.modules.archive
...
Updates and fixes to `salt.modules.archive` and `salt.utils.decorators.which`
2013-07-29 09:29:13 -07:00
Pedro Algarvio
14980b7497
Update the archive.tar
mocked test to the new usage.
2013-07-29 06:57:27 +01:00
Pedro Algarvio
4855c9427c
Simplify our decorator code and make it reusable.
2013-07-28 22:55:27 +01:00
Joseph Hall
d64dfdc70a
Merge pull request #6395 from s0undt3ch/sprint/mock-salt.modules.alternatives
...
Also test for `retcode > 0`.
2013-07-28 05:18:29 -07:00
Pedro Algarvio
5d0af6268e
Mocked test for salt.modules.archive.gunzip()
2013-07-28 12:51:13 +01:00
Pedro Algarvio
99b8f2f70f
Mocked test for salt.modules.archive.gzip()
2013-07-28 12:50:05 +01:00
Pedro Algarvio
3d17053e3f
Also test for retcode > 0
.
2013-07-28 12:41:15 +01:00
Pedro Algarvio
dcdb9bf686
Mocked test for salt.modules.archive.tar()
2013-07-27 19:24:49 +01:00
Thomas S Hatch
bca8014b00
Merge pull request #6347 from s0undt3ch/sprint/mock-salt.modules.alternatives
...
Mocked tests for `salt.modules.alternatives`
2013-07-27 10:14:17 -07:00
Pedro Algarvio
aabf18d76a
Remove un-neded import.
2013-07-27 18:11:55 +01:00
Pedro Algarvio
43b513e78f
Mocked test for salt.modules.alternatives.remove()
2013-07-27 18:07:18 +01:00
Pedro Algarvio
fa811882cc
Mocked test for salt.modules.alternatives.install()
2013-07-27 18:04:04 +01:00
Pedro Algarvio
6f10a44279
Mocked test for salt.modules.alternatives.check_installed()
2013-07-27 17:59:16 +01:00
Pedro Algarvio
068f0d6948
Mocked test for salt.modules.alternatives.show_current()
2013-07-27 17:56:05 +01:00
Pedro Algarvio
4b2ef2c3c8
Mocked test for salt.modules.alternatives.display()
2013-07-27 17:26:54 +01:00
Pedro Algarvio
42641c6153
Added test case to see if the usage of user
and runas
at the same time raises an exception.
2013-07-27 16:02:59 +01:00
Pedro Algarvio
c072fa0241
Also deprecate runas
on salt.states.pip
.
...
* Added mock tests to check if the deprecation is triggered, and to see if the deprecation is also returned to the user in a warnings key.
2013-07-27 15:58:28 +01:00
Pedro Algarvio
07e7366728
user
and runas
now raise an exception. "There can be only one".
...
* Always show the deprecation message `runas` is not `None`.
* If both `user` and `runas` are used, that's an error! Full Stop!
* If `runas` is being used and `user` is not, adapt the code and don't fail.
2013-07-27 13:34:58 +01:00
Pedro Algarvio
5ee8073979
Test the deprecated runas
argument to salt.modules.pip
.
2013-07-27 13:06:36 +01:00
Pedro Algarvio
a33f9d771b
Alaways show triggered deprecation warnings on the unit test.
2013-07-27 13:04:59 +01:00
Erik Johnson
d36fa57595
Change runas to user for pip module tests
2013-07-26 18:40:36 -05:00
Thomas S Hatch
579f900be6
Merge pull request #6328 from johnnoone/load-jinja-tag
...
Load jinja tag
2013-07-26 09:24:26 -07:00
Xavier Barbosa
c1b6e06a0f
added load tag, and revamped parsing
2013-07-26 09:30:41 +02:00
Pedro Algarvio
d52b109cdd
No general exception catching while rendering pillar. Refs #6305 . Refs #5910 .
...
* All errors while processing pillar data are now logged besides being returned.
* Removed the general exception catch. All we need to is check for the expected data type. If it ain't, log the error and continue to the next iteration.
* Added a mocked test case which besides testing the issue reported on #5910 , also tests for the proper includes data format and if salt fails accordingly and even if common data is merged.
2013-07-26 07:04:32 +01:00
Pedro Algarvio
98c63b9671
Test if --pre
option argument ends up in the resulting command line for pip.install
.
2013-07-24 08:03:50 +01:00
Thomas S Hatch
b93369d334
Merge pull request #6233 from johnnoone/jinja-import-yaml
...
Jinja import yaml
2013-07-20 19:55:54 -07:00
Pedro Algarvio
83004fd8f8
Allow salt.utils.warn_until()
to not issue the warning because we're only after the RuntimeError
behaviour.
2013-07-20 16:26:47 +01:00
Pedro Algarvio
eaa0b16e53
Added a helper function to raise warnings until a specified salt version.
...
The helper raises a warning, by default, a ``DeprecationWarning``, until the provided ``version_info`` is matched, after which, a ``RuntimeError`` will be raised to remember the developers to remove the warning.
2013-07-20 15:32:50 +01:00
Pedro Algarvio
40c5512bfb
Properly deprecate check_dns
.
...
Instead of having to leave `**kwargs` "forever" in `salt.config.minion_config` and `salt.config.apply_minion_config` in order to support API access to those which still passes `check_dns`. Support the argument but show a deprecation warning once. Leave the deprecation warning for 2 major releases. Then, finally, and properly, remove `check_dns` for good.
2013-07-20 01:39:23 +01:00
Pedro Algarvio
b03a5fcee3
Stop using the deprecated check_dns
in salt.config.minion_config
.
2013-07-20 01:38:09 +01:00
Xavier Barbosa
11ef87bd5d
finished cleanup
2013-07-19 16:53:51 +02:00
Xavier Barbosa
abd031963f
removed anchored yaml, does not work with CDumper...
2013-07-19 16:50:59 +02:00
Xavier Barbosa
f381590256
try to fix travis exception
2013-07-19 16:24:32 +02:00
Xavier Barbosa
f8bf53b682
added doc for yaml / json tags
2013-07-19 16:02:29 +02:00
Xavier Barbosa
9288281c63
added to jinja load* filters and tags
2013-07-19 16:02:28 +02:00
Xavier Barbosa
117f76def4
added AnchoredDumper
2013-07-19 16:02:28 +02:00
Pedro Algarvio
7aed6aeb30
Actually, the Syndic config test case can be a simple unit test.
2013-07-17 16:43:18 +01:00
Pedro Algarvio
e467b1e00b
Simplify the Syndic configuration testing.
...
* Inherit the master configuration file on the syndic one.
* Recreate the Syndic on the test. Don't pass it as a module global.
2013-07-17 16:22:18 +01:00
Pedro Algarvio
54ea179467
Only create TMP
if it doesn't already exists (hint: --no-clean
)
2013-07-17 12:34:36 +01:00
Pedro Algarvio
db6553a019
Skip unit.templates.jinja_test.TestGetTemplate.test_strftime
test if timelib
is not installed.
2013-07-17 11:23:42 +01:00
Thomas S Hatch
b8f26dad8d
Merge pull request #6124 from johnnoone/strftime-formatter
...
Strftime formatter
2013-07-16 17:11:46 -07:00
Mathieu Le Marec - Pasquet
cff1fa6f53
fix/feat: let the syndic be way more configurable
...
- Fix micmac between configs
- Add options to configure pidfile, logfile, masterofmaster port
This fixes #6024 .
2013-07-15 20:30:26 +00:00
Xavier Barbosa
22e1da9148
changed dateutil by timelib saltstack/salt#6088
2013-07-15 11:12:23 +02:00
Xavier Barbosa
00e373b63b
added unittests for strftime filter saltstack/salt#6088
2013-07-15 11:12:21 +02:00
Pedro Algarvio
d6b1e60fb1
Added a mocked test case for pip.list
with prefix matching.
2013-07-14 20:53:36 +01:00
Pedro Algarvio
01f489c79d
Added a mocked test case for pip.list
.
2013-07-14 19:30:08 +01:00
Pedro Algarvio
c83e767e06
Added a mocked test case for pip freeze
.
2013-07-14 19:25:44 +01:00
Pedro Algarvio
e17599a820
Added a mocked test case for --timeout
passing to pip uninstall
.
2013-07-14 19:02:41 +01:00
Pedro Algarvio
71c278384b
Added a mocked test case for --log
passing to pip uninstall
.
2013-07-14 19:01:27 +01:00
Pedro Algarvio
3e97e36e78
Added a mocked test case for --proxy
passing to pip uninstall
.
2013-07-14 18:59:23 +01:00
Pedro Algarvio
95ee5a9f36
Added a mocked test case for --proxy
passing to pip install
.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
315c1f911d
Added a mocked test case for multiple --requirements
passing to pip uninstall
.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
5435dc69e1
Added a mocked test case for multiple --requirements
passing to pip install
.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
411c926146
Prefix tests with install
since they're testing the install command.
2013-07-14 18:59:22 +01:00
Pedro Algarvio
02034c4d86
Added a mocked test case for --no-install
passing to pip install
.
2013-07-14 18:59:18 +01:00
Pedro Algarvio
716f760e80
Added a mocked test case for --no-deps
passing to pip install
.
2013-07-14 18:59:13 +01:00
Pedro Algarvio
89fa6cecf4
Added a mocked test case for --ignore-installed
passing to pip install
.
2013-07-14 18:59:08 +01:00
Pedro Algarvio
892646bdee
Added a mocked test case for --force-reinstall
passing to pip install
.
2013-07-14 18:59:01 +01:00
Pedro Algarvio
03c88dac2c
Added a mocked test case for --upgrade
passing to pip install
.
2013-07-14 18:58:56 +01:00
Pedro Algarvio
27959701dc
Added support and a mocked test case for --global-options
passing to pip install
.
2013-07-14 18:58:49 +01:00
Pedro Algarvio
fd200c96b0
Added a mocked test case for --install-options
passing to pip install
.
...
* Replaced all occurrences of `basestring` with the `string_types` from salt's `_compat` module.
* Properly split install options on commas.
* Install options need to be quoted.
2013-07-14 18:58:44 +01:00
Pedro Algarvio
12d05e4b9a
Added a mocked test case for --exists-action
passing to pip install
.
...
* `exists_action` now only accepts it's valid settings, one of `s`, `i`, `w`, `b`, else, `CommandExecutionError`.
2013-07-14 18:58:37 +01:00
Pedro Algarvio
fb16313804
Added a mocked test case for --source
passing to pip install
.
2013-07-14 18:58:33 +01:00
Pedro Algarvio
85b0d7964d
Added a mocked test case for --no-download
passing to pip install
.
2013-07-14 18:58:28 +01:00
Pedro Algarvio
60ef910bad
Added a mocked test case for --download-cache
passing to pip install
.
2013-07-14 18:58:24 +01:00
Pedro Algarvio
bfcd91d700
Added a mocked test case for --download
passing to pip install
.
2013-07-14 18:58:12 +01:00
Pedro Algarvio
6fbbd5fb31
Added a mocked test case for --target
passing to pip install
.
2013-07-14 18:58:06 +01:00
Pedro Algarvio
aa8dda75c7
Added a mocked test case for --build
passing to pip install
.
2013-07-14 18:57:58 +01:00
Pedro Algarvio
6e0e8fddf9
Added a mocked test case for --no-index
passing to pip install
.
2013-07-14 18:57:52 +01:00
Pedro Algarvio
467d7de4e5
Added a mocked test case for --extra-index-url
passing to pip install
.
2013-07-14 18:57:47 +01:00
Pedro Algarvio
900682ac51
Added a mocked test case for --index-url
passing to pip install
.
2013-07-14 18:57:43 +01:00
Pedro Algarvio
d3c1c43781
Add tests for proper protocols to find_links
.
2013-07-14 18:57:42 +01:00
Pedro Algarvio
72600f67e6
Test string argument on pkgs
, editable
, find_links
and mirrors
.
2013-07-14 18:57:42 +01:00
Pedro Algarvio
3372034c07
Added a mocked test case for --timeout
passing to pip install
.
2013-07-14 18:57:37 +01:00
Pedro Algarvio
c582d721d9
Added a mocked test case for --log
passing to pip install
.
2013-07-14 18:57:29 +01:00
Pedro Algarvio
21698d187d
Update mocked test case to have the package name as last argument to the pip install
call.
2013-07-14 18:57:20 +01:00
Pedro Algarvio
5e58d4c4f3
Added mock test case for clear
, upgrade
and symlinks
for the virtualenv_mod
.
2013-07-14 13:23:18 +01:00
Pedro Algarvio
45c258e00b
Added test case for the prompt argument to virtualenv_mod
.
2013-07-14 13:04:11 +01:00
Pedro Algarvio
d8536c9f87
Add a mocked test case for salt.modules.virtualenv_mod
python argument.
...
* Updated the `virtualenv_mod` mock test case to patch `salt.utils.which` and `sys.modules` at class level as opposed to every function.
2013-07-14 12:53:23 +01:00
Pedro Algarvio
c65b1348fe
Fix Travis-CI for unit.modules.virtualenv_test.VirtualenvTestCase.test_no_site_packages_deprecation
...
Also mock the `virtualenv` module.
2013-07-13 23:23:30 +01:00
Pedro Algarvio
b6471e4099
Mock the virtualenv module in unit.modules.virtualenv_test.VirtualenvTestCase.test_issue_6031_multiple_extra_search_dirs
. Is Travis-CI still going to complain?
2013-07-13 23:14:12 +01:00
Pedro Algarvio
2b1cf0ac14
Patch _install_script()
since the virtualenv module will try to install some scripts.
2013-07-13 19:55:51 +01:00
Pedro Algarvio
05f2a23733
Make use of salttesting.helpers.ForceImportErrorOn
.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
04133b07b4
Added mock test case to test getting the virtualenv version from shell and not from the module.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
606c6d5ffb
Add test case which tests if non proper arguments raise an exception.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
5c3a406e17
Let us not use a deprecated option ourselves unless for testing the deprecation.
2013-07-13 19:55:50 +01:00
Pedro Algarvio
de572cb193
Fix the virtualenv
unittests which rely on it's version changing.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
606413c063
Show a deprecation warning if no_site_packages
is used. Fixes #6027 .
...
If both `no_site_packages` and `system_site_packages` are used, throw an error.
Added the appropriate tests.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
cde1c628ac
Added a test case to check for multiple extra search dirs support. Refs #6031 .
2013-07-13 19:55:49 +01:00
Pedro Algarvio
2fd8dc299a
Add test case to check for proper handling of --never-download
. Refs #6030 .
...
Also added assertions to check for proper deprecation logging messages output.
2013-07-13 19:55:49 +01:00
Pedro Algarvio
6126aa47be
Small code and print's cleanup.
2013-07-13 19:55:48 +01:00
Pedro Algarvio
8858d1183f
Add test case which tests for proper deprecated output based on virtualenv version.
2013-07-13 19:55:48 +01:00
Pedro Algarvio
64c9463a8b
Merge pull request #6143 from s0undt3ch/issues/6129-unexpected-__env__-keyword
...
Fix Issue #6129 unexpected `__env__` keyword
2013-07-13 11:53:19 -07:00
Pedro Algarvio
5bee1ca7f3
Re-implement 06ac67c84a
the right way since the state __env__
was being confused by the shell environment. Fixes #6129 .
2013-07-13 18:45:30 +01:00
Pedro Algarvio
269175145f
Update mocked rvm unit test since we now call cmd.run_all
instead of cmd.retcode
.
2013-07-13 17:46:46 +01:00
Xavier Barbosa
3f49000ba2
unittesting for file.serialize and yaml & json filters
2013-07-08 16:19:19 +02:00
Joseph Hall
09490c51f1
Merge pull request #5986 from s0undt3ch/issues/5940-multiple-pip-mirrors
...
Add a state integration test case for #5940 .
2013-07-06 06:51:55 -07:00
Pedro Algarvio
66d86ca2d5
Added 2 test cases which prove that #5970 is invalid. Closes #5970 .
2013-07-06 12:48:13 +01:00
Pedro Algarvio
a886eaa03d
Add a state integration test case for #5940 .
2013-07-05 23:00:14 +01:00
Pedro Algarvio
66d51a036f
Switch assertRaisesWithMessage
with assertRaises
. The first was not working as supposed.
2013-07-05 01:21:00 +01:00
Pedro Algarvio
3c3933d25e
Test for the proper exception, remove stray character left behind.
2013-07-05 00:57:47 +01:00
Pedro Algarvio
edf66fd3fe
pip
allows multiple --find-links
to be passed. Added mocked tests too.
2013-07-05 00:54:11 +01:00
Pedro Algarvio
94575cbb63
Finish what was started on f78fca32
2013-07-05 00:53:41 +01:00
Pedro Algarvio
6a97be6115
Added integration test cases for multiple editables and pkgs for salt.modules.pip.install()
2013-07-04 18:57:42 +01:00
Pedro Algarvio
e6aa92901d
Add multiple editable's and pkgs+editable's test cases.
2013-07-04 17:24:24 +01:00
Pedro Algarvio
f78fca3256
We don't need to pass -u
when we're only passing unittests to -n
.
2013-07-04 17:17:48 +01:00
Pedro Algarvio
6158edee2d
Add a mocked unit testcase to test for multiple mirrors support. Refs #5940 .
2013-07-04 15:01:05 +01:00
Pedro Algarvio
f8216aa584
Fix unit tests to expect the new, single quotes and less wasted white-space, output.
2013-07-04 14:50:07 +01:00
Joost Cassee
7fd85c2963
Allow listing a single module in a top match
...
This makes the following valid syntax for the top.sls file:
base:
tommy.example.com: webserver
jerry.example.com: dbserver
alberon.example.com: mailserver
develop:
saturn.example.com: webserver
2013-07-04 00:20:08 +02:00
Pedro Algarvio
d6049a92b5
Use an unicode aware context in the jinja render call. Refs #3436
2013-07-02 14:28:20 +01:00
Pedro Algarvio
dea912d8a0
The result of ssh_known_hosts
changed in 8f728fb
, so should the test case.
2013-07-02 11:25:11 +01:00
Seth House
08127614f9
Updated arg to salt-key in minionswarm script
2013-07-01 17:03:39 -06:00
Sebastian Vetter
11a9858c6b
Correct behaviour of when using list with cross-env file path
2013-06-30 23:19:16 +10:00
Pedro Algarvio
cc7ecbceaa
ensure_in_syspath
now accepts multiple paths. Make use of it.
2013-06-29 20:57:23 +01:00
Pedro Algarvio
a977a4f4fa
Don't ignore environment variables pointing to valid configuration files. Fixes saltstack/salt-cloud#661
...
`salt.config.load_config()` cannot be hard-coded to use only the master configuration file as the default configuration file path to know if the user has passed any configuration file in the CLI tool or not.
To fix this, `default_path` was added. This way, the minion config or client config or even the salt cloud config can say which is the expected default path of the configuration file and properly load config from environment variables.
2013-06-28 20:39:37 +01:00
Pedro Algarvio
6e061b5d24
Updated unit.utils.verify_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:04 +01:00
Pedro Algarvio
bdf808773d
Updated unit.utils.safe_walk_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:04 +01:00
Pedro Algarvio
0675fae89c
Updated unit.utils.runtime_whitespace_regex_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:04 +01:00
Pedro Algarvio
155987dc08
Updated unit.utils.path_join_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:04 +01:00
Pedro Algarvio
6e1f36fb22
Updated unit.utils.find_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:04 +01:00
Pedro Algarvio
f35367613e
Updated unit.utils.filebuffer_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:04 +01:00
Pedro Algarvio
2081aff707
Updated unit.utils.event_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:04 +01:00
Pedro Algarvio
4a875f5b35
Updated unit.templates.jinja_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:04 +01:00
Pedro Algarvio
c04cc4a945
Updated unit.states.rvm_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
b13340e5ea
Updated unit.states.gem_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
0631e31cb1
Updated unit.modules.win_status_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
86564ba1ce
Updated unit.modules.rvm_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
7a5872b498
Updated unit.modules.postgres_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
9df34a39d7
Updated unit.modules.pip_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
99d828a650
Updated unit.modules.gem_test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
d7f2856365
Updated integration.states.virtualenv
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
afae35f14e
Updated integration.states.user
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
18752a83cc
Updated integration.states.svn
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
aeadc52132
Updated integration.states.supervisord
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
2ef34d1fd6
Updated integration.states.ssh
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
f3b145b118
Updated integration.states.rabbitmq_vhost
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:03 +01:00
Pedro Algarvio
e6791ee851
Updated integration.states.rabbitmq_user
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
f55263631d
Updated integration.states.pip
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
7c49cf1cdc
Updated integration.states.match
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
c92568da9e
Updated integration.states.host
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
415c3560e2
Updated integration.states.git
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
a75c24dd5f
Updated integration.states.file
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
671787d8cb
Updated integration.states.compiler
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
34ccae8c46
Updated integration.states.cmd
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
5a64ba438e
Updated integration.shell.syndic
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
63caaf8c6e
Updated integration.shell.runner
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
66b6acd0e0
Updated integration.shell.matcher
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
331dc6d936
Updated integration.shell.minion
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:02 +01:00
Pedro Algarvio
067f45f6ab
Updated integration.shell.master
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
dfa110d5cc
Updated integration.shell.key
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
495f8f0440
Updated integration.shell.cp
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
4c014ef284
Updated integration.shell.call
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
2aa572dda6
Updated integration.runners.state
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
7747ef4f1b
Updated integration.runners.manage
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
16451948a8
Updated integration.runners.jobs
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
d0aff7934d
Updated integration.modules.virtualenv
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
1a505cd703
Updated integration.modules.useradd
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
f69373a277
Updated integration.modules.test
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
738447d0a9
Updated integration.modules.sysmod
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
5fa18d41ec
Updated integration.modules.sysctl
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:01 +01:00
Pedro Algarvio
de41ca3136
Updated integration.modules.supervisord
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
b46bef99b9
Updated integration.modules.state
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
2c30133404
Updated integration.modules.ssh
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
4cdf6ae255
Updated integration.modules.rabbitmq
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
a3fbe47c9f
Updated integration.modules.pw_user
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
501cb0da31
Updated integration.modules.publish
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
863092af60
Updated integration.modules.pillar
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
c780c8b198
Updated integration.modules.mine
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
abc3ed115c
Updated integration.modules.hosts
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
b340166ea6
Updated integration.modules.grains
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
59bdfc532c
Updated integration.modules.file
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
cdb5828874
Updated integration.modules.event
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:13:00 +01:00
Pedro Algarvio
b920ded0b4
Updated integration.modules.django
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
d401041a8d
Updated integration.modules.disk
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
d62211f734
Updated integration.modules.decorators
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
423976e5d5
Updated integration.modules.data
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
de4345cf20
Updated integration.modules.cp
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
3f264ae987
Updated integration.modules.config
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
18af333312
Updated integration.modules.cmdmod
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
a3ac939f44
Updated integration.modules.aliases
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
b53da85646
Updated integration.client.syndic
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
f02494002b
Updated integration.client.standard
test suite to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
7945cbcd6e
Updated integration.client.kwarg
to use salttesting.helpers.ensure_in_syspath()
2013-06-28 00:12:59 +01:00
Pedro Algarvio
2097684c0a
Minor formating changes.
2013-06-28 00:12:59 +01:00
Pedro Algarvio
cb0922faf7
Updated some of the test cases to use a much more readable approach using salttesting.helpers.ensure_in_syspath()
.
2013-06-28 00:12:59 +01:00
Pedro Algarvio
007545eb70
Fix NameError
2013-06-28 00:12:58 +01:00
Pedro Algarvio
8cd0316b62
Heh! Salt! Not Salt Cloud!
2013-06-28 00:12:58 +01:00
Pedro Algarvio
a21b6e10a5
We don't want the tests in the coverage report.
2013-06-28 00:12:58 +01:00
Pedro Algarvio
819e523c2b
Use the defined SALT_ROOT
as the source parameter for the coverage call.
2013-06-28 00:12:58 +01:00
Pedro Algarvio
e772f0d8b6
Re-use salt-testing mixin.
2013-06-28 00:12:58 +01:00
Pedro Algarvio
77e108a281
Removed duplicate variables moved some others.
2013-06-28 00:12:58 +01:00
Pedro Algarvio
b17bc305c8
Reuse salt-testing shell test case.
2013-06-28 00:12:58 +01:00
Pedro Algarvio
7990165e26
Remove debug logic to test coverage.
2013-06-28 00:12:58 +01:00
Pedro Algarvio
3033e0002b
Let's make use of salt-testing code coverage testing option parser.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
1473a0a3b6
Make use of the SaltTestcaseParser
added to salt-testing.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
9cd7efb0dc
Only update sys.path
once.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
6dfe563ce1
Added support for __main__
execution.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
d245b17412
Added support for __main__
execution and formatting fixes.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
be6814fe52
Added support for __main__
execution and formatting fixes.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
2453535d9f
Added support for __main__
execution and formatting fixes.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
b0d9cf18c2
Added support for __main__
execution and formatting fixes.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
663f54ef9f
Update copyright years of changed files. Added __main__
execution to tests/integration/states/pip.py
.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
0a9f157262
Update sys.path
before import salt. This way salt does not need to be installed.
2013-06-28 00:12:57 +01:00
Pedro Algarvio
222be7b446
Make sure every test module is runnable by __main__
.
...
* Double to single quotes
2013-06-28 00:12:56 +01:00
Pedro Algarvio
be54a503d9
Adapted code fix sys.path
in case called from __main__
. Adapted to salt-testing.
2013-06-28 00:12:56 +01:00
Pedro Algarvio
860f74847e
Remove the now unnecessary saltunittest
. Moved remaining functionality to integration
.
2013-06-28 00:12:56 +01:00
Pedro Algarvio
d4fd1baa2f
Adapted the tests suite to work with salt-testing
2013-06-28 00:12:56 +01:00
Pedro Algarvio
576a5a4b78
Some more sysmod
testing improvements.
2013-06-27 23:15:36 +01:00
Pedro Algarvio
276858d619
Improve sys.list_functions
tests.
2013-06-27 23:00:55 +01:00
ZHANG Cheng
c86564abb1
Fix typo
2013-06-22 23:31:37 +08:00
Thomas S Hatch
3e3cb44acf
Merge pull request #5651 from s0undt3ch/issues/5639-hosts
...
Single entry per line in the hosts file. Fixes #5639
2013-06-20 11:08:36 -07:00
Pedro Algarvio
4040d83d79
Single entry per line in the hosts file. Fixes #5639
2013-06-20 18:29:21 +01:00
Thomas S Hatch
e2d7f21034
@jacksont, please take a look at these, they are failing sometimes
2013-06-20 11:22:59 -06:00
Thomas S Hatch
ec2ab4d5d3
Fix up tests for decorators
2013-06-20 11:21:56 -06:00
Thomas S Hatch
3e7be2bfb4
Add os import to grains tests
2013-06-19 22:45:26 -06:00
Thomas S Hatch
e037283488
Ignore the grains setval test in travis because travis can't keep up
2013-06-19 22:28:53 -06:00
Thomas S Hatch
e30ce41d7a
we are far enough removed to not need to test version deps here
2013-06-19 12:43:27 -06:00
Thomas S Hatch
86afd5356c
disable faulty djangomod test
2013-06-19 00:35:08 -06:00
Thomas S Hatch
e59a646afa
Need to find a way to only bump this up on travis....
2013-06-19 00:32:08 -06:00
Thomas S Hatch
982df86d6b
disable svn tests
...
These tests are causing problems since the svn repos are not always
returning the same data
2013-06-19 00:24:16 -06:00
Thomas S Hatch
862112c5a6
Fix error created by yaml changes
2013-06-18 23:51:44 -06:00
Thomas S Hatch
17f292a21a
Add ignores for loaded depends modules
...
@jacksont, just fyi, we check the loaded modules for docstrings
2013-06-18 16:38:42 -06:00
Thomas S Hatch
e0c10755b9
Some cleaning of quotes and prints
2013-06-18 16:11:36 -06:00