Commit Graph

911 Commits

Author SHA1 Message Date
Pedro Algarvio
d4c07d6776 Merge pull request #13574 from whiteinge/misc-salt-api-fixes
Misc salt api fixes
2014-06-20 01:28:41 +01:00
Pedro Algarvio
15071b460a Merge pull request #13579 from rallytime/cloud_config_unittests
Unit tests for cloud_config function in salt.config.py
2014-06-20 00:50:08 +01:00
Seth House
66e2b54f36 Added encoding comment to empty init files 2014-06-19 17:37:44 -06:00
Seth House
d00cd104ac And yet more pylint fixes 2014-06-19 17:25:56 -06:00
rallytime
3a84dd4a3c Unit tests for cloud_config function in salt.config.py 2014-06-19 16:03:59 -06:00
Thomas S Hatch
a46e6f4875 Merge pull request #13383 from s0undt3ch/issues/10404-vt-ptys-not-released
[DO NOT MERGE] Fix #10404 vt ptys not released
2014-06-19 14:16:52 -06:00
Pedro Algarvio
f518e1f186 Merge pull request #13564 from rallytime/migrate_cloud_config_tests
Migrate cloud config tests
2014-06-19 19:10:17 +01:00
rallytime
8f74282a34 Removed cloud_config_test.py file 2014-06-19 09:24:47 -06:00
rallytime
e53ec01cd4 Transfer cloud_config_test.py tests to config_test.py 2014-06-19 09:20:38 -06:00
Pedro Algarvio
34fcf1da45 Test if we're closing open PTY's 2014-06-19 13:08:50 +01:00
Pedro Algarvio
7590586d05 Don't fail on missing CherryPy 2014-06-19 13:00:38 +01:00
Seth House
53bab586f4 Merged salt-api into Salt
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
2014-06-18 22:13:56 -06:00
Seth House
1d4057fadf Updated all saltapi import paths to salt.netapi 2014-06-18 20:56:16 -06:00
rallytime
636cf892ca Pylint fix 2014-06-18 17:47:05 -06:00
rallytime
c7e3816e54 Unit tests for cloud provider extends functionality 2014-06-18 17:15:15 -06:00
rallytime
914c9ed1fb First rudimentary cloud provider config tests 2014-06-17 15:12:23 -06:00
Pedro Algarvio
9f7ead2e33 Remove unused imports 2014-06-15 13:05:18 +01:00
Pedro Algarvio
c2ab05bc56 Tempdir under integration.SYS_TMP_DIR and use AdaptedConfigurationTestCaseMixIn 2014-06-15 13:05:18 +01:00
Pedro Algarvio
000655d7f4 Use SaltClientTestCaseMixIn instead 2014-06-15 13:05:18 +01:00
Pedro Algarvio
4cbd6c6238 Remove unused imports 2014-06-15 13:05:17 +01:00
Pedro Algarvio
318409a859 Don't remove the root_dir, the tests suite takes care of that 2014-06-15 13:05:17 +01:00
Thomas S Hatch
60ac9b8321 Merge pull request #13433 from ahammond/psql_nopassword
psql should never prompt for a password
2014-06-14 07:24:14 -06:00
Thomas S Hatch
396078d1aa Merge pull request #13446 from anylain/add_traverse_dict_and_list
Add salt.utils.traverse_dict_and_list()
2014-06-14 07:23:15 -06:00
panying
742607a33f + add test_traverse_dict_and_list 2014-06-14 15:25:02 +08:00
Andrew Hammond
1c6b95b4dc psql should never prompt for a password
No matter if we have been given a password or not, it never makes sense
for psql to interactively prompt for a password. It's better to fail
immediately than to hang because psql is waiting for input that will
never happen.
2014-06-13 17:40:11 -07:00
Mathieu Le Marec - Pasquet
a6262beeb3 Fix the broken check state logic 2014-06-13 13:20:14 +02:00
Erik Johnson
0104ccc400 Fix failing jinja unit tests
These began failing due to a recent change in the error reporting for
undefined jinja variables.
2014-06-12 14:33:53 -05:00
Pedro Algarvio
0564fc363e A more generic directory name 2014-06-10 03:25:14 +01:00
Pedro Algarvio
9bd6d330ec Change to an existing directory before importing keyring 2014-06-10 01:52:53 +01:00
Pedro Algarvio
9d208eaf76 Use an explicit path for the keydir not getcwd 2014-06-10 01:52:53 +01:00
Pedro Algarvio
a7b7f18e6f Double to single quotes 2014-06-06 12:24:10 +01:00
Pedro Algarvio
c4e47df943 Don't use the hardcoded path 2014-06-05 10:10:55 +01:00
Pedro Algarvio
bebddb9174 Don't use hardcoded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
36ea569d0d Don't use hard coded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
7e11871d9f Ensure correct syspath 2014-06-01 06:55:52 +01:00
Thomas S Hatch
ba4cc71a14 fix more sls to yamlex refs 2014-05-30 10:14:47 -06:00
Thomas S Hatch
8b3dabbf7d lint 2014-05-30 09:45:46 -06:00
Thomas S Hatch
b8897a5b0d rename the sls renderer to the yamlex renderer 2014-05-30 09:28:20 -06:00
Thomas S Hatch
185eae31cd Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration
Conflicts:
	salt/pillar/__init__.py
2014-05-30 09:16:21 -06:00
Thomas S Hatch
84f4fa1430 Merge pull request #13122 from cachedout/test_fixing
Fix broken tests
2014-05-30 09:08:53 -06:00
Pedro Algarvio
204ed95c2c PyLint ignore W1111 (assignment-from-none) 2014-05-30 09:38:35 +01:00
Mike Place
11e6ddf33c Fix SMTP test
Magic or ugly hack? You decide.
2014-05-29 16:38:59 -06:00
Mike Place
623b01af81 Pylint 2014-05-29 16:13:42 -06:00
Mike Place
0e53190996 Fix broken tests
Thanks to @rallytime for pointing out that several unit tests
were not working correctly when run locally.

I have fixed the perm_test to no longer use relative paths. I have
also disabled this tests since, at some point at least, perms changed
to be 0664 instead of 0644 in a number of places. This warrents further
discussion.

I have fixed pydsl_test to no longer throw errors to stdout about
missing SLS files. (Yay!!)

I have fixed the smtp_return tests so that it will without errors
on hosts with gnupg installed.
2014-05-29 15:04:11 -06:00
Michaël Lemaire
7b437abd4f Fixed MagicMock import in postgres_test 2014-05-28 15:14:22 +02:00
Michaël Lemaire
cd0f4adae8 Fixed postgres_group.present always updating on test=True 2014-05-28 15:11:24 +02:00
Michaël Lemaire
07bedfe362 Fixed state postgres_user always updating on test=True 2014-05-28 15:05:50 +02:00
Michaël Lemaire
a4b3ef9a69 Added unit tests for postgres_user.present 2014-05-28 14:58:53 +02:00
Michaël Lemaire
5126f0a8ac states.postgres_extension: Fixed unit test patching (and renamed to PostgresExtensionTestCase for future tests) 2014-05-28 14:58:09 +02:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00