Commit Graph

1425 Commits

Author SHA1 Message Date
Pedro Algarvio
1a2e9be5d4 Adapt test case to Suse based distributions. 2013-09-05 04:39:54 +01:00
David Boucha
5b76394850 Check for each service status individually
In case they self report out of order
2013-09-04 21:37:26 -06:00
Thomas S Hatch
5c270dbd92 Merge pull request #7056 from s0undt3ch/develop
Fix unwanted TRACE level messages
2013-09-04 19:37:34 -07:00
Pedro Algarvio
a685a05a0c Fix the salt CLI tools version check test case 2013-09-05 03:34:12 +01:00
David Boucha
3f1498364d Test service status separately
Sometimes the 2 services return in different orders so we'll test for
each one separately
2013-09-04 15:40:50 -06:00
Seth House
1ff3c953e6 Added sls and pillar as params
This change is backward compatible...but untested.
2013-09-04 14:29:41 -06:00
Pedro Algarvio
6d446ffa56 Use the requires_system_grains decorator from salt-testing 2013-09-04 20:05:41 +01:00
Pedro Algarvio
38bfa49e53 SuSE based distributions get the gid from users not the gid from it's name. Fixes #7003.
Full explanation about why is this can be seen here:

  https://github.com/saltstack/salt/issues/7003#issuecomment-23813071
2013-09-04 19:41:20 +01:00
David Boucha
1a216bf08c remove commented out code 2013-09-03 11:39:21 -06:00
David Boucha
fa489634a5 check for multiple strings in the test 2013-09-03 11:37:46 -06:00
David Boucha
6fd2146239 split those strings on their path 2013-09-03 00:53:10 -06:00
David Boucha
2dc500d1d7 remove trailing space 2013-09-01 23:40:39 -06:00
Pedro Algarvio
7e57813243 Always remove the users/groups added to the system 2013-09-02 05:51:29 +01:00
Pedro Algarvio
8d29140cdc Test user/group creation/deletion under FreeBSD 2013-09-02 05:50:06 +01:00
Thomas S Hatch
66daa60d75 Merge pull request #6976 from malinoff/fixed-range-syntax
Fixed range syntax
2013-08-31 19:49:41 -07:00
Thomas S Hatch
5ec6539ce5 Merge pull request #6967 from s0undt3ch/hotfix/tests-config-files
Adapt tests configuration to the running user.
2013-08-31 19:37:20 -07:00
=
3fdfe9120f Replaced range(len(collection)) with enumerate(collection) 2013-08-31 13:38:42 +07:00
Pedro Algarvio
7cdddf8bf8 Fix unit.log_test.TestLog.test_issue_2853_regex_TypeError to import the proper(renamed) logging module. 2013-08-30 19:32:39 +00:00
Pedro Algarvio
598fc60e3c Fix unit.log_test.TestLog.test_issue_2853_regex_TypeError by importing salt's logging from the proper module. 2013-08-30 19:32:39 +00:00
Pedro Algarvio
9eac31d6dd Use proper pip mirrors in integration.states.virtualenv.VirtualenvTest.test_issue_2594_non_invalidated_cache 2013-08-30 19:32:39 +00:00
Pedro Algarvio
d7c9db70e2 Adapt tests configuration to the running user.
Since salt's cli tools now try to change the user to the configured one, when running the tests suite as non-root, we need to adapt the user setting on the configuration files.
2013-08-30 17:25:28 +00:00
Pedro Algarvio
20c45fbb6d Updated test case to install from a requirements file. 2013-08-29 20:21:23 +00:00
Pedro Algarvio
610c30f359 pip.installed ownership testcase using user instead of runas. Refs #6912. 2013-08-29 17:30:27 +00:00
Pedro Algarvio
a38077248f Verify proper owner for pip.installed. Refs #6912
Added test case which verifies that the owner of the `pip.installed` package is the one provided by `runas`.
2013-08-29 17:30:27 +00:00
Pedro Algarvio
51a01ef79b Added mocked pip installation test-case for when pip's version is <=1.1 2013-08-29 10:57:50 +00:00
Pedro Algarvio
93c034e4ca Merge pull request #6949 from ranl/hosts
fix hosts file error in Travis
2013-08-29 02:55:54 -07:00
ranl
f42961081d fixing 61573b1394 (commitcomment-3967806) 2013-08-29 11:50:20 +03:00
Pedro Algarvio
25a72358ab Skip this test until properly mocked. 2013-08-28 15:21:29 +00:00
Pedro Algarvio
57feb4a015 One more missing import 2013-08-28 15:21:29 +00:00
Pedro Algarvio
5ea856c104 Fix missing import 2013-08-28 15:21:29 +00:00
Pedro Algarvio
2b64d0482d Make sure every temp dir created on the unittests respects, integration.SYS_TMP_DIR 2013-08-27 15:31:58 +00:00
Pedro Algarvio
456360dc32 Fix test expected output plus an additional one for pip git install. 2013-08-26 17:05:47 +00:00
Pedro Algarvio
6e694791fb Allow tests to be properly skipped if mock is not installed. 2013-08-26 17:05:44 +00:00
Pedro Algarvio
57a69f1ff8 Adapted integration.modules.django to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
6d06e12e22 Adapted integration.modules.cmdmod to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
5d26a9fd4b Adapted unit.states.rvm_test to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
23fa44ff58 Adapted unit.states.pip_test to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
8f44dec13e Adapted unit.states.gem_test to use salttesting.mock 2013-08-26 13:03:08 +00:00
Pedro Algarvio
ef29861ff3 Adapted unit.states.file_test to use salttesting.mock 2013-08-26 13:03:07 +00:00
Pedro Algarvio
2eab51a429 Adapted unit.utils.warnings_test to use salttesting.mock 2013-08-26 13:03:04 +00:00
Pedro Algarvio
296c83be1f Adapted unit.pillar_test to use salttesting.mock 2013-08-26 13:01:02 +00:00
Pedro Algarvio
91fa38aea2 Adapted unit.payload_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
d33415c73a Adapted unit.modules.rvm_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
220aa48e24 Adapted unit.modules.poptgres_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
6bc17f0c1b Adapted unit.modules.pip_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
64d20afec9 Adapted unit.modules.gem_test to use salttesting.mock 2013-08-26 13:00:10 +00:00
Pedro Algarvio
2acd67bc59 Adapted unit.modules.archive_test to use salttesting.mock 2013-08-26 13:00:07 +00:00
Pedro Algarvio
8646fcb012 Adapted unit.modules.win_status_test to use salttesting.mock 2013-08-26 12:59:15 +00:00
Pedro Algarvio
fe0d7dc048 Adapted unit.modules.alternatives_test to use salttesting.mock 2013-08-26 12:59:12 +00:00
Pedro Algarvio
371f08a959 Adapted unit.modules.virtualenv to use salttesting.mock 2013-08-26 12:58:04 +00:00
Pedro Algarvio
5075898935 No absolute imports. 2013-08-22 21:45:45 +01:00
Pedro Algarvio
52b8da5d13 Adapt to the output when installing a package from a compressed file. 2013-08-22 21:06:06 +01:00
Pedro Algarvio
c78738b87a Adapt test results to the expected output. 2013-08-22 19:02:32 +01:00
Pedro Algarvio
df8bdf8646 By forcing absolute imports, we don't have to rename the pip state module. 2013-08-22 19:02:18 +01:00
Pedro Algarvio
aea94fd6a2 Another example test case. 2013-08-22 19:02:18 +01:00
Pedro Algarvio
e70827371f Some more requirements parsing tests 2013-08-22 19:02:18 +01:00
Pedro Algarvio
58ad040872 Use pip.req for parsing package requirements. Minimal tests. 2013-08-22 19:02:17 +01:00
Pedro Algarvio
1a12829637 Switched arguments in SaltReturnAssertsMixIn.assertInSaltReturn() 2013-08-22 19:02:17 +01:00
Pedro Algarvio
2c09600ea4 Switched arguments in SaltReturnAssertsMixIn.assertNotInSaltReturn() 2013-08-22 19:02:17 +01:00
Pedro Algarvio
ae5d9f5038 Switched arguments in SaltReturnAssertsMixIn.assertNotInSaltComment() 2013-08-22 19:02:17 +01:00
Pedro Algarvio
b880af89e1 Switched arguments in SaltReturnAssertsMixIn.assertInSaltComment() 2013-08-22 19:02:17 +01:00
Pedro Algarvio
f9176a9064 Let's try Popen. 2013-08-22 12:27:58 +01:00
Pedro Algarvio
e817f0087a Redirect stderr to stdout. 2013-08-22 11:59:25 +01:00
Pedro Algarvio
0860da1852 Add debug print to check if communicate is doin' the right thing. 2013-08-21 23:41:27 +01:00
Pedro Algarvio
8100b41c7e Fixed splitting named unittests from named integration tests.
This commit got lost somewhere. I could swear I committed this fix previously...
2013-08-21 19:23:16 +01:00
Pedro Algarvio
bd002f97da Revert "By enforcing absolute imports, there's no need for module name aliases."
This reverts commit a1a2b49a72.
2013-08-20 23:44:05 +01:00
Pedro Algarvio
9353dcafd3 Revert "salt.modules.cmdmod renamed to salt.modules.cmd while enforcing absolute imports."
This reverts commit 3fa341280b.
2013-08-20 23:44:03 +01:00
Pedro Algarvio
d598a8074e Revert "Renamed djangomod module and state to django while enforcing absolute imports."
This reverts commit 2f4d82b295.
2013-08-20 23:43:56 +01:00
Pedro Algarvio
2f4d82b295 Renamed djangomod module and state to django while enforcing absolute imports. 2013-08-19 16:13:38 +01:00
Pedro Algarvio
3fa341280b salt.modules.cmdmod renamed to salt.modules.cmd while enforcing absolute imports. 2013-08-19 13:45:56 +01:00
Pedro Algarvio
a1a2b49a72 By enforcing absolute imports, there's no need for module name aliases. 2013-08-19 13:23:46 +01:00
Pedro Algarvio
49a6cfdc51 On bootstrap failure, also cleanup. 2013-08-17 07:59:13 +01:00
Pedro Algarvio
d66609c630 Revert "Make salt-cloud run our testrun state to get a streamed output"
This reverts commit d8b011d103.
2013-08-17 06:06:51 +01:00
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