Commit Graph

1695 Commits

Author SHA1 Message Date
regilero
a59d47bc9e Merge remote-tracking branch 'upstream/develop' into mysql_additions 2013-12-06 10:53:32 +01:00
Thomas S Hatch
f65887cbda Merge pull request #8993 from olliewalsh/eventtest
Another unit test for events
2013-12-05 11:39:33 -08:00
regilero
3769474d9d One more test,to be sure 2013-12-05 18:50:31 +01:00
regilero
7d05551062 Manage errors containing utf-8 or unicode charcters at the jinja level 2013-12-05 18:46:43 +01:00
regilero
bd9a0394ae Integration tests for issue #8947 utf-8 in sls 2013-12-05 18:18:20 +01:00
Joseph Hall
17ca2aeac2 Merge pull request #9024 from cachedout/#8976
Grains detection for LXC and fix error in disk.usage under Docker
2013-12-05 04:34:15 -08:00
Erik Johnson
cadbcbd59d add test case for #8585 2013-12-04 17:29:48 -06:00
regilero
0bfbd7835e MySQL: Suspend grants tests 2013-12-04 22:43:27 +01:00
regilero
b376d1a82b MySQL States integration module with db tests 2013-12-04 22:33:33 +01:00
regilero
5d9ed7d935 typo 2013-12-04 22:33:12 +01:00
regilero
934e62f587 Lint fixs 2013-12-04 22:33:03 +01:00
regilero
ee02117404 BUGFIX: custom MySQldb converter breaks use_unicode code in MySQLdb as 4 types should be set as list and not strings. It was breaking the connection when using use_unicode attribute 2013-12-04 22:32:53 +01:00
regilero
67dc2f5eaa Mostly working mysql user management integrations tests 2013-12-04 22:32:44 +01:00
regilero
ffe6de1592 Integration tests for MySQL user managment, WIP 2013-12-04 22:32:07 +01:00
regilero
73f6fc347a MySQL unit tests, fix mock calls to match the new ones 2013-12-04 22:31:08 +01:00
Mike Place
398ebc1503 Don't run the #8976 tests on Windows. 2013-12-04 12:38:54 -07:00
Mike Place
e6e0a7d919 Integration testing for #8976 2013-12-04 12:34:20 -07:00
Pedro Algarvio
4a5c10f296 Merge pull request #9007 from cachedout/postgres-unit-tests
First-pass unit test coverage for the Postgres execution module.
2013-12-04 02:47:41 -08:00
Mike Place
6d4a422c20 First-pass unit test coverage for the Postgres execution module. 2013-12-03 19:00:26 -07:00
Mathieu Le Marec - Pasquet
50cdd562ad make buildout test more robust 2013-12-04 01:51:23 +00:00
Mathieu Le Marec - Pasquet
7d299f9c0f pylint fixes 2013-12-04 00:25:56 +00:00
Mathieu Le Marec - Pasquet
5f46962e80 pep8 fixes 2013-12-04 00:25:50 +00:00
Ollie Walsh
68e0e3a106 Add unit test for event timeouts 2013-12-03 22:44:52 +00:00
Pedro Algarvio
877bdb2a90 Lint white-space fixes. 2013-12-03 20:30:16 +00:00
Pedro Algarvio
a7365b6322 No last line 2013-12-03 20:28:41 +00:00
Pedro Algarvio
205ed46577 Easier path building 2013-12-03 20:28:08 +00:00
Pedro Algarvio
d6d2993486 No un-indexed curly braces on string .format() calls 2013-12-03 20:24:21 +00:00
Thomas S Hatch
ef40793106 Merge pull request #8982 from s0undt3ch/hotfix/salt-cloud-merge
Missed `vm_config` to `profiles_config` and tests
2013-12-03 11:13:50 -08:00
Pedro Algarvio
13a9effdaf Add unit tests regarding include.d directories loading. 2013-12-03 19:08:30 +00:00
Chris Rebert
d91851a479 fix naming of modules.mysql.quoteIdentifier() to follow convention 2013-12-03 10:42:24 -08:00
Pedro Algarvio
63cb0571c1 Skip temporary files. 2013-12-03 18:38:53 +00:00
Thomas S Hatch
77d61d92a4 Merge pull request #8914 from makinacorpus/issue-8856-buildout-support
feat: buildout support
2013-12-03 09:56:59 -08:00
Mathieu Le Marec - Pasquet
3a55194ba6 lint fix 2013-12-03 17:56:50 +00:00
Mathieu Le Marec - Pasquet
e9246d2a77 Remove bootstrap.py's & adapt tests for zcbuildout module 2013-12-03 17:53:58 +00:00
Thomas S Hatch
f07150c4b8 Merge pull request #8961 from olliewalsh/eventfix
Fix issue #8580
2013-12-03 09:27:27 -08:00
Mathieu Le Marec - Pasquet
30511257a8 add requires_network for buildout test 2013-12-03 16:51:46 +00:00
Ollie Walsh
8bacb953c0 Fix typo 2013-12-03 01:45:18 +00:00
Ollie Walsh
d81aeb2c0e More tests 2013-12-03 01:22:51 +00:00
Ollie Walsh
f9aca16aee More unit tests and longer timeouts for travis-ci 2013-12-02 23:20:54 +00:00
Ollie Walsh
6fe85f1294 Add some basic unit tests for events 2013-12-02 22:26:13 +00:00
Thomas S Hatch
2918ac4209 Merge pull request #8801 from s0undt3ch/hotfix/deprecate-salt-cloud-config-file
Deprecate salt cloud split config files to CLI tool
2013-12-02 10:36:14 -08:00
Mathieu Le Marec - Pasquet
9bcea05010 Remove obsolete test 2013-12-02 13:42:34 +00:00
Pedro Algarvio
b71e7c6ba7 Fix Lint issues. 2013-12-02 13:06:35 +00:00
regilero
b93f1f8d02 MySQL: Add integration Tests for database names with utf8 characters 2013-12-02 12:13:10 +01:00
Pedro Algarvio
a6d0165977 Replace deprecated X.has_key(Y) syntax with Y in X. 2013-12-02 10:35:13 +00:00
Pedro Algarvio
29ee963f62 Fix Lint issues. Closes #8930. 2013-12-02 10:33:13 +00:00
regilero
f5ea59df83 BUG: MySQL integration tests: false positive on accents with assertTrue, use assertEqual instead and comment accents tests 2013-12-01 17:11:37 +01:00
regilero
69fe9eb27d MySQL: Module integration tests for maintenance tasks check/repair/optimize 2013-12-01 15:27:47 +01:00
regilero
772144af8a MySQL unit tests, make the examples more complex 2013-12-01 10:43:13 +01:00
Erik Johnson
093065b130 add test for #8614 2013-11-30 22:00:05 -06:00
regilero
95a41bdb9a MySQL integration tests on module level unicode support 2013-12-01 01:35:41 +00:00
Pedro Algarvio
923428c68b Fix PyLint issues. 2013-12-01 01:35:41 +00:00
Pedro Algarvio
c129d3f567 Remove packages installation from mysql tests and push that on travis yml with an opt_requirements.txt source 2013-12-01 00:34:58 +00:00
regilero
1556a3f2c6 Fix mysql unit tests for queries with parameters 2013-12-01 00:34:30 +00:00
regilero
05c02c4c50 Try to install python-mysql in travis env via pip to enable MySQL module 2013-12-01 00:34:30 +00:00
regilero
b5f588a9fc Initial MySQL integration test with MySQl packages installed 2013-12-01 00:34:29 +00:00
regilero
d3cdb68a37 Initial MySQL integration test with MySQl packages installed 2013-12-01 00:34:29 +00:00
regilero
1319755c55 Fix typo in mysql unit test 2013-12-01 00:34:29 +00:00
Mathieu Le Marec - Pasquet
228c987b76 feat: buildout support
This fixes #8856.
2013-11-29 18:51:20 +00:00
Pedro Algarvio
31200152bb Use the new form of passing the configuration file. 2013-11-28 19:52:03 +00:00
Pedro Algarvio
62039527ce The cloud tests need libcloud installed. Skip them if not. 2013-11-28 19:40:17 +00:00
Pedro Algarvio
8d3e3d3402 Skip the test if python-apt is not installed for Debian like systems. 2013-11-28 19:26:21 +00:00
Joseph Hall
b32e8901d0 Merge pull request #8899 from terminalmage/tests
Simplify jinja syntax for ubuntu pkgrepo test deps
2013-11-28 10:31:21 -08:00
Erik Johnson
13dbb9efab Simplify jinja syntax for ubuntu pkgrepo test deps
See the below discussion for more info:

https://github.com/saltstack/salt/pull/8872#discussion-diff-7981734R64
2013-11-28 12:27:39 -06:00
Pedro Algarvio
660a91d1ea Merge the salt-cloud cli integration tests into salt's test suite. Refs #8886. 2013-11-28 17:55:58 +00:00
Pedro Algarvio
9289c9cf31 Add a deploy_scripts_search_path test case.
The test checks if the user provided search path is loaded, even if not passed as a list, and if it's the first occurrence on the list.
2013-11-28 11:18:09 +00:00
Pedro Algarvio
4a08f332af Move and update the cloud configuration unit tests. 2013-11-28 11:02:23 +00:00
Erik Johnson
0ffce3ce6d Fix ubuntu deps for pkgrepo integration tests
This fixes a typo'ed package name, as well as doing logic to determine
the correct package name based on the osrelease.
2013-11-27 20:01:14 -06:00
Thomas S Hatch
aa4bdc043b Fix pylint errors in tests 2013-11-27 10:50:55 -07:00
Joseph Hall
0351da57c6 Merge pull request #8860 from cachedout/smtp_returner_test
Unit-test SMTP returner.
2013-11-27 09:18:52 -08:00
Mike Place
4108fb72a2 Unit-test SMTP returner. 2013-11-27 10:10:51 -07:00
Colton Myers
dd2883dff8 Fix eventlisten.py for minion event bus
The sock_dir modification was happening after the minion opts had
already returned.  Just make sure it happens before any return
statement.
2013-11-27 09:39:52 -07:00
Thomas S Hatch
33a719c1d4 Merge pull request #8848 from terminalmage/tests
Add pkgrepo.managed test SLS for Ubuntu
2013-11-27 08:10:12 -08:00
Pedro Algarvio
6e596738de Disable some PyLint warnings. 2013-11-27 13:07:24 +00:00
Pedro Algarvio
aa8ead9897 Remove duplicate method 2013-11-27 13:06:59 +00:00
Pedro Algarvio
77df007d2f Ignore the exception not declared Pylint error. 2013-11-27 13:04:45 +00:00
Pedro Algarvio
b21bf4b682 Extra or misplaced white-space 2013-11-27 12:59:56 +00:00
Pedro Algarvio
880c9b5cff Fix PEP8 E261 - White space before inline comment 2013-11-27 12:56:35 +00:00
Pedro Algarvio
b34377612e Remove extra white-space. 2013-11-27 12:54:34 +00:00
Pedro Algarvio
ac8963b286 Ignore the relative import warning. 2013-11-27 12:54:13 +00:00
Pedro Algarvio
f2e3a4aebe Fix PyLint C0322 and C0324 - Spaces around opertor and commas 2013-11-27 12:48:53 +00:00
Pedro Algarvio
eea0001942 Fix PyLint W0105(String statement has no effect) 2013-11-27 12:32:54 +00:00
Pedro Algarvio
7164ac1826 Fix Undefined variable 2013-11-27 12:31:27 +00:00
Pedro Algarvio
b841c7fdbe Indexed .format() curly braces! 2013-11-27 12:14:30 +00:00
Pedro Algarvio
0ae1a15c61 PEP8 E302 and E303 blank lines fixes. 2013-11-27 12:11:45 +00:00
Pedro Algarvio
14b59ac073 Include the coding header. 2013-11-27 12:04:43 +00:00
Pedro Algarvio
08c5c8e83a Fix PyLint W1401, anomalous backslash. 2013-11-27 11:24:26 +00:00
Pedro Algarvio
d02a2bc224 Include the python encoding file header on tests. 2013-11-27 11:19:24 +00:00
Pedro Algarvio
b89252b264 The docker tests need docker. Skip them if not available. 2013-11-27 10:36:51 +00:00
Erik Johnson
55b870e43a Add pkgrepo deps for ubuntu
This fixes travis failures due to needed python module not being
installed.
2013-11-26 23:55:26 -06:00
Erik Johnson
f56ad56a5a Add pkgrepo.managed test SLS for Ubuntu
pkgrepo.absent is not behaving properly, will add a test case for
pkgrepo.absent later once I've had a chance to troubleshoot.
2013-11-26 23:22:59 -06:00
Thomas S Hatch
3ee05e605a Merge pull request #8839 from cachedout/mysql-unit-tests
MySQL execution module unit testing.
2013-11-26 14:28:32 -08:00
Mike Place
ad3a4e11b3 Oops. Didn't see the naming scheme for unit tests. 2013-11-26 15:27:43 -07:00
Mike Place
3326dbfd98 First-pass at establishing a unit-testing framework for the mysql execution module. 2013-11-26 15:16:42 -07:00
Thomas S Hatch
eb9ba6fda0 Merge pull request #8756 from s0undt3ch/issues/8343-require_in-KeyError
Fix accomulator issues
2013-11-26 13:18:49 -08:00
Thomas S Hatch
079c849adf Merge pull request #8834 from cro/dockerio_cleanup
Add some tests for docker integration.
2013-11-26 11:18:22 -08:00
C. R. Oldham
10ef0de5f6 Add some tests for docker integration. 2013-11-26 12:13:25 -07:00
Thomas S Hatch
5637339b2c Merge pull request #8823 from regilero/requisites-fix
Fix #8773: allow syntax error state.foo in requisites with a warning.
2013-11-26 08:07:40 -08:00
Thomas S Hatch
25dcbefb9c Merge pull request #8820 from terminalmage/tests
Add pkgrepo tests for CentOS
2013-11-26 08:05:34 -08:00
regilero
4497751420 Fix #8773: allow syntax error state.foo in requisites with a warning. 2013-11-26 11:57:09 +01:00
regilero
9094d36b44 Comment tests for closed issue #8802 2013-11-26 10:54:32 +01:00
regilero
ab88a276dc remove test for issue #8976 closed as expected behavior 2013-11-26 10:51:47 +01:00
Erik Johnson
05de056df0 Add an assert to ensure that the state.sls return dict isn't empty 2013-11-25 17:41:03 -06:00
Erik Johnson
1c9f2fc224 Remove grains requirement
I had this code here in an early draft of this test, but the grains are
no longer needed here as the stuff that requires grains has been moved
out of the test function and into the SLS files that are run by the
test.
2013-11-25 17:30:18 -06:00
Erik Johnson
a77357f01d Fix pkgrepo tests when python file is run by itself on CLI 2013-11-25 17:27:26 -06:00
Erik Johnson
c2e346835c Add pkgrepo tests for CentOS
Ubuntu ones will follow soon.
2013-11-25 17:20:32 -06:00
regilero
9b20a408a4 commented tests for issue 8802 use recursion undetected 2013-11-25 15:35:22 +01:00
regilero
38bd6709f0 require vs require_in in not-list yamlsyntax: differences, still on #8235 2013-11-25 12:58:59 +01:00
regilero
58bfbff843 prereq tests for issue #8235 (yaml without lists) and error message difference in no-list mode 2013-11-25 12:46:02 +01:00
regilero
8024df8404 Add test for #8796: use does not inherit require. False test actually 2013-11-25 11:06:37 +01:00
regilero
5d248146df Remove wrong comments on prereq working test 2013-11-24 18:33:15 +01:00
regilero
aaa6f44677 Missing states for the mixed require and prereq mixed tests 2013-11-24 18:30:44 +01:00
regilero
8177f2b609 Add another working prereq simple test 2013-11-24 18:30:15 +01:00
regilero
0354e408e3 Comments on require test example 2013-11-24 18:28:59 +01:00
regilero
ddb99a570d require and prereq mixed tests, mostly failing, see #8785 2013-11-24 18:28:22 +01:00
Pedro Algarvio
f0bf78cdc0 Correct the state test case and respective expected output. 2013-11-24 12:15:20 +00:00
Pedro Algarvio
a752421b87 Expose a copy of the state dictionary to state functions.
Fixes #8343 since `__sls__` is now available in `__state__` and not on `kwargs`.
Closes #8709 since it's not the right approach.
Fixes #8710 and closes #8711 since I've cherry-picked the fix for #8710 in from #8711.
2013-11-24 11:08:33 +00:00
regilero
ab4ee0ba1f full sls require test, and yet to do check for require_in or prereq #8233 2013-11-23 18:56:07 +01:00
regilero
7b01991c0a require recursion and still not done prereq recursion 2013-11-23 18:20:15 +01:00
regilero
a99cd0eafd Use requisite 2013-11-23 17:26:37 +01:00
regilero
6a7d35bc59 commented test for issue #8211 complex prepreq 2013-11-23 16:59:10 +01:00
regilero
e4c68d1a94 small typo 2013-11-23 16:47:10 +01:00
regilero
ceb5963094 Prereq and prerequ_in tests 2013-11-23 16:39:19 +01:00
regilero
407533dfa5 require and require_in tests 2013-11-23 16:37:57 +01:00
Mathieu Le Marec - Pasquet
50c1235502 add a test for #8707 2013-11-21 12:57:51 +01:00
Jeffrey C. Ollie
b1fb52a680 fix more funcion => function typos 2013-11-15 14:50:17 -06:00
Emil Stenqvist
f487d5568a Fix for issue #8519
Also added a test that fails prior to the fix, illustrating the problem.
2013-11-14 14:26:35 +01:00
Pedro Algarvio
8ba59ea6c6 Adapt the tests to the latest Jinja2 template changes. 2013-11-14 01:21:57 +00:00
Pedro Algarvio
55e0290da6 Fix the mocked contents pillar file state tests. 2013-11-12 07:55:03 +00:00
Pedro Algarvio
54fc502de0 Some more saltenv related tests. 2013-11-12 06:29:55 +00:00
Pedro Algarvio
f25f0a41b2 Deprecate env usage in favor of saltenv. 2013-11-12 01:01:51 +00:00
Pedro Algarvio
097aed1e7e Show the error in case of failure. 2013-11-12 01:01:51 +00:00
Pedro Algarvio
f4cba0d293 Deprecate env usage in favor of saltenv. 2013-11-12 01:01:50 +00:00
Pedro Algarvio
d88d34ca24 The GitHub IP changed. 2013-11-11 07:45:10 +00:00
Pedro Algarvio
4fb38e1e91 Merge pull request #8385 from s0undt3ch/hotfix/test-kwarg
Document passing arguments with equal signs. Refs a1ba178d.
2013-11-10 10:28:20 -08:00
Pedro Algarvio
a192d03ffb Only delete the file if it actually exists. 2013-11-10 15:36:39 +00:00
Pedro Algarvio
66cf8f1845 The argument name is arg, not args. 2013-11-10 15:36:11 +00:00
Pedro Algarvio
0f25353e08 Pass a relative path for proper test execution.
If we're trying to test a failure which happens when the path is not absolute, let's not pass it an absolute path in the first place.
2013-11-10 15:30:42 +00:00
Pedro Algarvio
c66fc86f79 Document passing arguments with equal signs. Refs a1ba178d.
Add additional documentation regarding arguments passing with equal signs for which salt tries hard to turn into keyword arguments. The problem now arises because non supported arguments immediately thrown an exception.
2013-11-10 11:40:01 +00:00
Joseph Hall
34360ac306 Merge pull request #8373 from s0undt3ch/develop
Typo
2013-11-09 05:29:57 -08:00
Pedro Algarvio
b5c9815e9a Arguments like pip==1.0 must not match yaml'ification as as keyword arguments. 2013-11-09 10:32:27 +00:00
Pedro Algarvio
544f7e127d Don't use the deprecated self.assertEquals(). 2013-11-09 09:01:18 +00:00
Pedro Algarvio
dfab7aab73 Adapt the runtests parser to support running the tests suite under a Docker container. 2013-11-08 20:20:03 +00:00
Pedro Algarvio
960118df29 Reintroduce the removed grains information.
Removed on 4617a931be and 52be720d62.
2013-11-08 19:50:38 +00:00
Pedro Algarvio
34ed606b0d Revert "Remove debugging pprint"
This reverts commit 4617a931be.
2013-11-08 19:39:30 +00:00
Pedro Algarvio
3b1f2126fb Revert "Remove unused grains lookup"
This reverts commit 52be720d62.
2013-11-08 19:39:12 +00:00
Thomas S Hatch
0ca3a1093b Merge pull request #8332 from s0undt3ch/issues/__sls__-KeyError
Take into account python types not just Yaml strings
2013-11-07 16:01:16 -08:00
Thomas S Hatch
d4ddb8344d Merge pull request #8329 from cachedout/#8259
Exception handling for missing id
2013-11-07 15:59:39 -08:00
Pedro Algarvio
77101231f2 Install a smaller and with less dependencies package. 2013-11-07 22:09:36 +00:00
Mike Place
00c7d36966 Exception handling for missing id
Refs #8259. We don't like tracebacks. Includes unit test.
2013-11-07 11:59:07 -07:00