valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,202 Commits 24 Branches 182 Tags 341 MiB
0bc66403b9
Commit Graph

1713 Commits

Author SHA1 Message Date
Thomas Jackson
e2102fcbc7 Pylint cleanup 2014-11-14 09:15:54 -08:00
Thomas Jackson
6f0552c9e1 Pylint fixes 2014-11-13 09:33:14 -08:00
Thomas Jackson
9e61037b0d Cleanup, and fix exp_form override-- we need to do it after the ping to minions 2014-11-13 08:36:28 -08:00
Thomas Jackson
ce22427071 Remove timeout test since that no longer valid 2014-11-13 08:36:28 -08:00
Thomas Jackson
31b54762b0 Add tests for multi-post and multi-token 2014-11-13 08:36:28 -08:00
Thomas Jackson
a259f2149b Move syndic_wait_done into base class (more than one func need it) 
Change local_batch to just call local to get the minion list
 2014-11-13 08:36:28 -08:00
Thomas Jackson
522090a8c8 Rework local to ping minions, and wait a min of syndic_wait (if a syndic) 2014-11-13 08:36:28 -08:00
Thomas Jackson
9d4784f835 Update todo marker 2014-11-13 08:36:28 -08:00
Thomas Jackson
8cd7b06b36 Change disbatch to handle different clients per lowstate chunk 2014-11-13 08:36:27 -08:00
Thomas Jackson
1131522eb5 Update TODO marker 2014-11-13 08:36:27 -08:00
Thomas Jackson
b99e189468 Add tests for WebhookSaltAPIHandler 2014-11-13 08:36:27 -08:00
Thomas Jackson
2d9b1df95d Add tests for EventsSaltAPIHandler 2014-11-13 08:36:27 -08:00
Thomas Jackson
847df0fad6 Add RunSaltAPIHandler tests 2014-11-13 08:36:27 -08:00
Thomas Jackson
bd58ca8fa0 Add Jobs api endpoint tests 2014-11-13 08:36:27 -08:00
Thomas Jackson
f0f9b14ee2 Add tests for MinionSaltAPIHandler 2014-11-13 08:36:27 -08:00
Thomas Jackson
cd01c9a1d6 Add check for the redirect location 2014-11-13 08:36:27 -08:00
Thomas Jackson
8bd72aeb4f Add test for unauthorized access 2014-11-13 08:36:27 -08:00
Thomas Jackson
7ef2537842 Finished basic tests for base SaltAPIHandler 2014-11-13 08:36:27 -08:00
Nicole Thomas
d54fbe8887 Merge pull request #17866 from jfindlay/netapi_known_jid_test 
integration test: known JID through netapi #15763
 2014-11-13 09:17:45 -07:00
Chris Rebert
67b3e19690 tests/integration/__init__.py: salt._compat => six 2014-11-11 14:36:25 -08:00
Justin Findlay
b097a1e16b pre-emptive pylint fix0r 2014-11-11 15:22:40 -07:00
Justin Findlay
abb3ba87bf integration test: known JID through netapi #15763 2014-11-11 15:15:36 -07:00
Chris Rebert
478e406001 replace salt._compat.string_types with six.string_types 2014-11-11 13:45:52 -08:00
Mike Place
da163471af Fix up tests 2014-11-10 15:42:45 -07:00
Pedro Algarvio
4235d15184 Merge branch '2014.7' into develop 2014-11-07 21:47:49 +00:00
Pedro Algarvio
31d3b7b955 Revert "Freeze the testing runtime configs at a latter stage" 
This reverts commit 5da3ad341b.
 2014-11-07 20:39:49 +00:00
Pedro Algarvio
ea89edf3d8 Switch run_ssh with run_function 2014-11-06 23:58:40 +00:00
Pedro Algarvio
b425c20919 2 of 500000 
Let's not hardcode the SSH tests to the root user without the need for
that.
 2014-11-06 19:42:59 +00:00
Pedro Algarvio
1b2e16a19e Merge branch '2014.7' into develop 2014-11-05 22:47:06 +00:00
Pedro Algarvio
5da3ad341b Freeze the testing runtime configs at a latter stage 2014-11-05 22:42:38 +00:00
Thomas S Hatch
c8bfd87105 Merge pull request #17153 from rallytime/merge_forward 
Merge 2014.7 into develop
 2014-11-04 15:03:28 -07:00
rallytime
b49c677af8 Merge branch '2014.7' into merge_forward 
Conflicts:
	salt/daemons/flo/core.py
	salt/daemons/salting.py
	salt/minion.py
	salt/modules/introspect.py
	salt/modules/lxc.py
	salt/modules/sysmod.py
	salt/runners/doc.py
	salt/states/cloud.py
	salt/transport/__init__.py
	salt/utils/github.py
 2014-11-04 10:07:02 -07:00
Roman Inflianskas
fb5e86aaa1 modules.linux_acl: satisfy pylint 2014-11-04 16:17:35 +03:00
Roman Inflianskas
83b760db44 modules.linux_acl: add integration tests 2014-11-04 14:45:23 +03:00
rallytime
92fc46607f Don't use HVM image type. 2014-11-03 16:12:21 -07:00
rallytime
e272c41bb8 Use Ubuntu 14 image for ec2 cloud tests instead of RHEL 6 2014-11-03 15:13:14 -07:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
Nicole Thomas
573390d8ad Merge pull request #17054 from jacksontj/2014.7 
Fix for #17051
 2014-10-31 10:14:16 -06:00
Thomas Jackson
6262d44d50 Add "normalize_ret" function, so we don't have to copy/paste so much 
Add checks for "changes" since we want to test cases where there aren't changes to be made
 2014-10-30 16:58:03 -07:00
Thomas Jackson
d2b548a0e7 Add regression test for #17051 2014-10-30 16:43:06 -07:00
Colton Myers
f625c21d77 Merge branch '2014.7' into mergeforward 
Conflicts:
	salt/cloud/clouds/ec2.py
	salt/daemons/flo/worker.flo
	salt/master.py
	salt/minion.py
	salt/modules/lxc.py
	salt/states/win_update.py
	salt/states/zk_concurrency.py
 2014-10-30 17:42:36 -06:00
Pedro Algarvio
17564057c9 Actually kill the tests sshd process. Provide a custom know_hosts file to use. 2014-10-30 06:45:52 +00:00
Thomas Jackson
52f7216bea Revert naming here too 2014-10-29 14:35:27 -07:00
Thomas Jackson
6612aa808e Revert spelling fix, since its a variable name :) 2014-10-29 13:56:44 -07:00
Mike Place
c1c9245e89 Fixup test failures 2014-10-28 11:29:59 -06:00
Thomas Jackson
aabe6460f6 Misc comment cleanup in tests 2014-10-28 08:12:10 -07:00
Mike Place
e18190bc04 remove sed test 2014-10-27 18:22:18 -06:00
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
rallytime
f94cf6ad68 Change profile name for Digital Ocean cloud tests 
Digital Ocean changed their image-naming scheme. This should fix the failing tests.
 2014-10-24 16:14:02 -06:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop 
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
 2014-10-19 18:21:19 +01:00
Daniel Mizyrycki
e421aff68d Fix lint 2014-10-17 15:39:49 -07:00
Daniel Mizyrycki
54738d0ff5 Added salt-ssh integration test for custom module within SLS 2014-10-17 15:39:49 -07:00
Seth House
c6cb642f36 Added integration tests for the --out-indent flag for JSON output 2014-10-16 20:46:34 -05:00
Thomas S Hatch
1f5da204a9 Fix lint 2014-10-15 16:56:41 -06:00
rallytime
96a1288808 Add minions_denied to netapi test 2014-10-14 16:49:07 -06:00
C. R. Oldham
d07ebe2105 Test for retcode 2014-10-14 13:28:19 -06:00
Thomas S Hatch
5ab6743b85 Merge branch '2014.7' into develop 2014-10-13 20:06:17 -06:00
Thomas S Hatch
4b630d77ed Merge pull request #16407 from s0undt3ch/hotfix/cache-loaded-configs 
First attempt at caching the loaded configuration from the filesystem.
 2014-10-13 20:05:52 -06:00
Mathieu Le Marec - Pasquet
2d1200b64e pep8 2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
acd15e386e display traceback in test error 2014-10-13 15:32:11 -06:00
Mathieu Le Marec - Pasquet
1c4616556a Another fix for outputter reliability 2014-10-13 15:32:10 -06:00
Thomas S Hatch
b2e730a2a6 Merge pull request #16158 from thatch45/pillar_opts_false 
Set pillar_opts to default to False
 2014-10-13 14:33:44 -06:00
Thomas S Hatch
251a036938 Set the tests to still asume pillar_opts 2014-10-13 08:58:20 -06:00
Mathieu Le Marec - Pasquet
7fe9a5e612 pep8 2014-10-12 12:16:07 +02:00
Mathieu Le Marec - Pasquet
a0aa6eee89 display traceback in test error 2014-10-12 11:37:28 +02:00
Mathieu Le Marec - Pasquet
43fce63b5c Another fix for outputter reliability 2014-10-11 18:37:35 +02:00
rallytime
2c513cf2bb Remove print from tests 2014-10-09 10:33:34 -06:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
Pedro Algarvio
8e93faa072 Fix lint errors 2014-10-08 01:02:11 +01:00
Pedro Algarvio
ab6a54dbf5 The runtime client gets an unfreeze version of the configs 2014-10-08 01:02:10 +01:00
Pedro Algarvio
5e4eb4bbaf Don't add tests in __init__ 2014-10-08 01:02:10 +01:00
Pedro Algarvio
e739561728 Use the salttesting skip helpers 2014-10-08 01:02:10 +01:00
Pedro Algarvio
d569f0811e Let's go wild and cache the local client as reusable a runtime global instance 2014-10-08 01:02:10 +01:00
Pedro Algarvio
3de914e556 Move tests away from __init__ 2014-10-08 01:02:08 +01:00
Pedro Algarvio
dee2c91fde Test the runner client under tests/integration/clients 2014-10-08 01:00:20 +01:00
Pedro Algarvio
d0ca8274ae Remove the unnecessary integration.ClientCase class 2014-10-08 01:00:19 +01:00
Pedro Algarvio
b32d86d0f4 Allow getting the configuration from scratch. 
Properly handle `client_config` when loading from cache.
Only delete the `_client` attribute if it has been set.
 2014-10-08 01:00:06 +01:00
Pedro Algarvio
93e8b12b93 Try caching the client too 2014-10-08 00:57:22 +01:00
Pedro Algarvio
bbc9120471 The syndic_config call needs the path to the minion config file 2014-10-08 00:57:22 +01:00
Pedro Algarvio
4d047a67f5 Handle more config filenames 2014-10-08 00:57:22 +01:00
Pedro Algarvio
3a3c6b06dd First attempt at caching the loaded configuration from the filesystem. 
This basically should avoid loading and parsing YAML over and over again.
 2014-10-08 00:57:22 +01:00
Seth House
dd400f2e96 Added integration tests WheelClient cmd_sync cmd_async 2014-10-07 16:43:15 -06:00
Seth House
9bd61a1bd6 Added integration tests for wildcard eauth usernames 2014-10-03 13:28:29 -06:00
Seth House
12b1ba289a Added a wildcard eauth user for testing 2014-10-03 13:28:29 -06:00
Seth House
d0366eaf50 Added unit test for running arguments through the RunnerClient 2014-10-03 13:25:04 -06:00
Seth House
0d07099444 Added integration tests for wildcard eauth usernames 2014-10-02 23:53:37 -06:00
Seth House
a5d861314b Added a wildcard eauth user for testing 2014-10-02 19:21:51 -06:00
Seth House
dbe2fe5c92 Added unit test for running arguments through the RunnerClient 2014-10-02 12:00:01 -06:00
rallytime
8e55094ecd Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/influx.py
 2014-10-01 10:12:06 -06:00
Thomas S Hatch
1cfd7f7d66 Merge branch '2014.7' into develop 
Conflicts:
	salt/netapi/rest_tornado/saltnado.py
 2014-09-30 11:40:15 -06:00
Thomas Jackson
d9fdc06742 Ensure that timeout will happen for jobs that don't target any alive minions 
Instead of checking if all returns are in, we should check that the job is not running anywhere then enforce the per-minion timeout. I've added a test case for the instance where there is a job fired to a minion that will never return (before it would stall forever)
 2014-09-30 10:11:55 -07:00
Thomas Jackson
98af66bbf3 Add a regression test for #16240 2014-09-29 16:37:53 -07:00
Thomas S Hatch
a90fc60a82 Merge branch '2014.7' into develop 2014-09-25 14:23:54 -06:00
Pedro Algarvio
227c62b4ee Merge pull request #16149 from rallytime/improve_loader_test 
Fix linode test failures and test all modules
 2014-09-25 20:38:06 +01:00
Colton Myers
7f551d48b4 Merge branch '2014.7' into develop 2014-09-25 13:09:19 -06:00
rallytime
210adceeff Actually, just fix pylint 2014-09-25 12:36:00 -06:00
rallytime
e2dce8acba Skip ssh grains test for now. Test environment isn't set up to handle it. 2014-09-25 11:47:44 -06:00
rallytime
ac40a5b2da Fix linode test failures and test all modules 2014-09-25 11:34:50 -06:00
Thomas S Hatch
3198a17193 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/minion.py
	salt/modules/hg.py
	salt/utils/process.py
 2014-09-25 09:08:14 -06:00
Daniel Mizyrycki
e0c6c8c22a salt-ssh, issue #16129: 
Add integration/regression test for issue affecting grains and pillar subsystem.
 2014-09-24 20:58:37 -07:00
Thomas S Hatch
3ce955c774 Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/deploy/bootstrap-salt.sh
 2014-09-24 12:46:37 -06:00
Thomas S Hatch
43272781f1 Merge pull request #15933 from felskrone/list_denied_minions 
List denied minions
 2014-09-24 09:34:19 -06:00
vs
af070a56ad its 'Denied Keys', not 'Denied Minions' 2014-09-24 14:10:49 +02:00
Colton Myers
76d5fdb41f Revert "Change timeout for CLI returns" 2014-09-23 16:44:37 -06:00
Thomas S Hatch
8c72baa660 Merge pull request #15942 from jacksontj/develop 
Change timeout for CLI returns
 2014-09-23 15:40:34 -06:00
Thomas Jackson
c77e2d36ae Pylint fix 2014-09-23 14:37:34 -07:00
rallytime
9fc915e639 Remove 'running' check - it's not reliable 2014-09-23 15:06:08 -06:00
rallytime
1c9e062c78 Fix the ec2 cloud provider tests 2014-09-23 14:55:56 -06:00
Thomas Jackson
ff0081b53d Remove "never timeout" feature 2014-09-23 13:35:11 -07:00
Pedro Algarvio
de520f4766 Revert "Fix broken test on 2014.7" since it runs properly on develop 
This reverts commit 9c682933d4.
 2014-09-23 19:52:48 +01:00
Colton Myers
3db44821e4 Merge branch '2014.7' into develop 
Conflicts:
	salt/config.py
 2014-09-23 12:43:47 -06:00
vs
b804056b65 add expected output for denied minions to test_* 2014-09-23 17:36:06 +02:00
Pedro Algarvio
f547aeae41 Merge pull request #16033 from rallytime/fix_2014.7_tests 
Fix broken test on 2014.7
 2014-09-23 00:09:10 +01:00
rallytime
9c682933d4 Fix broken test on 2014.7 2014-09-22 12:13:10 -06:00
vs
ca5e63ed24 create minions_denied in test-env, update wheel-test to expect minions_denied 2014-09-22 19:44:24 +02:00
Arnold Bechtoldt
3e483523ff changing param back to backend in fileserver to improve useability 2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
94516433e7 fix integration test in fileserver runner, refs #16008 2014-09-22 11:16:27 -06:00
Arnold Bechtoldt
b588245c1d extend fileserver runner with additional features 2014-09-22 11:16:26 -06:00
Arnold Bechtoldt
043c29d518 changing param back to backend in fileserver to improve useability 2014-09-22 08:18:13 +02:00
Arnold Bechtoldt
6b251cbb05 fix integration test in fileserver runner, refs #16008 2014-09-21 21:19:03 +02:00
Arnold Bechtoldt
db5dde72cf extend fileserver runner with additional features 2014-09-21 20:16:41 +02:00
Pedro Algarvio
aed0178072 Correct --output-file-append test 2014-09-19 10:33:38 -06:00
Thomas Jackson
3815bbbfa8 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-09-19 08:11:31 -07:00
rallytime
ffe00e0909 Update ec2 provider and profile config files for cloud nightly tests 2014-09-18 20:41:08 -06:00
rallytime
d861915d93 Add EC2 cloud test file 2014-09-18 20:41:08 -06:00
Thomas Jackson
4abe763591 Add tests for timeouts to client tests. In addition this makes all of the client functions have the same functionality 2014-09-18 14:38:13 -07:00
Thomas Jackson
a7e3586274 Add CLI timeout tests to standard client tests 2014-09-18 14:10:02 -07:00
Pedro Algarvio
8e3f9963cb Correct --output-file-append test 2014-09-17 19:40:58 +01:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/minion.py
	salt/output/nested.py
 2014-09-16 18:46:48 -05:00
Thomas S Hatch
4df1ba300c Merge pull request #15839 from jacksontj/develop 
Handle OSErrorin processmanager
 2014-09-16 15:05:07 -06:00
Thomas Jackson
29110d0a92 Cleanup, the function name changed 2014-09-16 13:22:55 -07:00
rallytime
064868b87a Fix test failures on develop 2014-09-16 12:23:06 -06:00
rallytime
85f82816c2 Revert "Put provider specific information only in provider configuration file" 
This reverts commit 1ccec204b2.
 2014-09-16 08:40:43 -06:00
rallytime
a5c658b337 Disable pylint unused import warning 2014-09-16 07:14:38 -06:00
rallytime
1ccec204b2 Put provider specific information only in provider configuration file 2014-09-16 07:08:18 -06:00
rallytime
2801dfbee4 Rename azure tests to match cloud module and add azure sdk import back in 2014-09-16 06:35:12 -06:00
rallytime
35793bd8d9 Pylint fix 2014-09-15 20:20:37 -06:00
rallytime
b30e750a8a Azure cloud tests 
Oh, and rename cloud.profiles.d/azure.sls to cloud.profiles.d/azure.conf
 2014-09-15 16:58:26 -06:00
rallytime
a30ccd2a7b Add cloud provider and profile configuration files 2014-09-15 15:57:27 -06:00
Colton Myers
e92dc99e9a Merge branch '2014.7' into temp-merge-forward 
Conflicts:
	salt/minion.py
 2014-09-12 10:37:24 -06:00
Pedro Algarvio
080a06252a Merge pull request #15676 from rallytime/ec2_cloud_tests 
Ec2 cloud tests
 2014-09-12 08:23:51 +01:00
rallytime
6679f26736 Remove unused kwarg from _check_state_return 2014-09-11 23:32:51 -06:00
Thomas S Hatch
0004ff8898 Merge branch '2014.7' into develop 2014-09-09 11:20:29 -06:00
rallytime
40253cb47b Update ec2 provider and profile config files for cloud nightly tests 2014-09-08 17:06:45 -06:00
rallytime
99cc951377 Add EC2 cloud test file 2014-09-08 16:18:48 -06:00
Thomas S Hatch
0a094e2c43 Merge pull request #15104 from srkunze/feature/safe_env 
Made safe environment copy
 2014-09-08 14:48:58 -06:00
rallytime
690e85a089 Change expected return for deleting digital ocean instance 2014-09-08 14:13:26 -06:00
Thomas S Hatch
467fd955ed Merge pull request #15564 from s0undt3ch/hotfix/git-describe-first-parent 
Use the first parent on git describe when available.
 2014-09-06 16:31:46 -06:00
Pedro Algarvio
0a1857b8f1 Update test case to also use --first-parent 2014-09-06 02:32:18 +01:00
rallytime
1727d04701 Generate random cloud provider names on digital ocean 2014-09-05 15:57:00 -06:00
rallytime
6de2a37ec8 Generate random cloud instance name on rackspace tests 2014-09-05 14:09:42 -06:00
rallytime
df504928b6 Update linode tests to use a randomly generated instance name 2014-09-05 09:23:40 -06:00
Sven R. Kunze
d294e95cf5 fixed test_os_environment_remains_intact 2014-09-05 12:20:08 +02:00
Thomas S Hatch
921fd6362c Merge pull request #15512 from ajacoutot/obsd-tests 
tests: recognize OpenBSD
 2014-09-04 15:27:42 -06:00
Colton Myers
57e187d46f Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/mount.py
 2014-09-04 13:45:03 -06:00
Antoine Jacoutot
1ef276575f tests: recognize OpenBSD 2014-09-04 10:23:59 +02:00
rallytime
155b548eae Remove unnecessary import requirements to cloud integration tests 2014-09-03 20:12:44 -06:00
Thomas S Hatch
ab1c6bcf27 One more test fix 2014-09-03 08:43:52 -06:00
Thomas S Hatch
b95d575e52 Fix tests for new changes from PR #15217 2014-09-02 17:39:50 -06:00
Colton Myers
704180fd43 Merge branch '2014.7' into develop 
Conflicts:
	salt/utils/cloud.py
 2014-08-28 12:18:07 -06:00
Thomas S Hatch
55422ccc42 Merge pull request #15303 from whiteinge/fix-wheelclient-auth-tests 
Fix failing integration tests for the wheel client
 2014-08-27 15:50:25 -06:00
Erik Johnson
ff6a228746 Remove reference to nonexistant function in pkg tests 
This fixes a ref that was missed in 7984a8c.
 2014-08-27 13:52:36 -05:00
Seth House
a96d58cfba Fix failing integration tests for the wheel client 2014-08-26 19:20:25 -06:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Erik Johnson
ec07a8efea Get effective username using pwd.getpwduid() 2014-08-21 15:22:54 -05:00
Erik Johnson
43de873bb2 D'oh, needed to capitalize USERNAME 2014-08-21 14:35:36 -05:00
Erik Johnson
26a3db2ac8 Set USERNAME env var manually in test suite 
This works around a known issue in GitPython when the USERNAME
environment variable is missing.
 2014-08-21 12:19:31 -05:00
Erik Johnson
bf982d6893 Update gitfs test opts to reflect new gitfs config opts 2014-08-20 22:23:45 -05:00
Colton Myers
916141fac0 Merge branch '2014.7' into develop 
Conflicts:
	tests/integration/shell/call.py
 2014-08-20 14:39:31 -06:00
Pedro Algarvio
bf406bf459 Add test case for --output-file-append 2014-08-20 02:42:29 +01:00
Pedro Algarvio
b6e259c21e Add test case for output file permissions 
Refs #14979
 2014-08-20 02:28:13 +01:00
Pedro Algarvio
ea41586ba4 Merge branch '2014.7' into develop 2014-08-18 05:37:12 +01:00
Thomas S Hatch
02da0dda32 Merge pull request #15016 from whiteinge/netapi-fix-logout 
Add tests and a fix for the rest_cherrypy logout view
 2014-08-15 23:20:35 -06:00
Colton Myers
932aa97e1f Merge branch '2014.7' into develop 2014-08-15 16:33:02 -06:00
rallytime
b8db5ff56b Change lxc skipIf message to be more helpful 2014-08-15 14:21:09 -06:00
rallytime
396a4de7c5 Make lxc tests run! 2014-08-15 11:09:20 -06:00
Seth House
2b5bed43b9 Add integration test for logging out of the rest_cherrypy app 2014-08-15 09:45:30 -04:00
Pedro Algarvio
9134a69dc1 Merge pull request #14990 from rallytime/gitpillar_tests 
Fix gitpillar skipIfs
 2014-08-14 18:44:29 +01:00
rallytime
7f170c126f Remove 'RC1' from GIT_VERSION comparison 2014-08-14 11:06:18 -06:00
rallytime
fe5b8d22ec Fix gitpillar skipIfs 2014-08-14 10:34:38 -06:00
Seth House
e2ed04351d Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/modules/npm.py
 2014-08-13 18:56:23 -04:00
Thomas S Hatch
a0d7163abb Merge pull request #14967 from rallytime/pillar_tests 
Add skipIfs to pillar tests if GitPillar 0.3.2rc1 or > isn't installed
 2014-08-13 16:53:56 -06:00
rallytime
496cfe25b3 Add skipIfs to ext_pillar tests if GitPillar 0.3.2rc1 or > isn't installed 2014-08-13 14:14:53 -06:00
Colton Myers
19cf82fd5f Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/transports/raet/index.rst
	salt/minion.py
 2014-08-12 14:15:50 -06:00
Seth House
11f4e20bd8 Fix incorrect call to state.single in npm pkgs test 2014-08-11 11:03:00 -04:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Seth House
8a60ce5351 Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	doc/topics/development/conventions/formulas.rst
 2014-08-07 15:51:49 -04:00
Seth House
ed4bb5119e Added pkgs support to the npm module/state 2014-08-07 12:36:39 -04:00
Colton Myers
13995afba0 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/releases/2014.7.0.rst
 2014-08-05 15:32:04 -06:00
rallytime
6be33dcdc9 Change install package to help Arch tests pass 2014-08-05 14:35:32 -06:00
Colton Myers
0307fdbe9a Merge branch '2014.7' into develop 
Conflicts:
	salt/runners/manage.py
 2014-08-01 10:52:52 -06:00
rallytime
f5597010ca Add GPG key file to integration tests 2014-07-31 10:57:49 -06:00
Thomas S Hatch
aeda9730ca Merge pull request #14460 from steverweber/fix_restarts 
fix issues with keepalive minion
 2014-07-25 21:46:01 -06:00
Seth House
c046f1cac7 Revert "Switch NetapiClient to use client_config instead of master_config" 
This partially reverts commit 2bc1ed8afb.
 2014-07-25 14:42:19 -06:00
steverweber
bf8f936fa4 fix issues with keepalive minion 2014-07-25 15:13:05 -04:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
C. R. Oldham
f53e477735 Merge commit, resolve conflict 2014-07-25 11:16:22 -06:00
C. R. Oldham
c94808689d Extend dot-in-pkg test to RHEL 5 as well 2014-07-25 10:57:18 -06:00
Thomas S Hatch
288e9bba29 TABS?!?!? Really @cro ?? 2014-07-25 10:39:19 -06:00
Thomas S Hatch
35c3614f7f Merge branch 'rhel7_pkgtests' of https://github.com/cro/salt into cro-rhel7_pkgtests 2014-07-25 10:38:10 -06:00
C. R. Oldham
1891b07856 Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:11:56 -04:00
C. R. Oldham
b6f70ac80f Make this test check for diff packages on RHEL/Centos 6 vs 7 2014-07-24 19:09:52 -04:00
Seth House
2bc1ed8afb Switch NetapiClient to use client_config instead of master_config 
We access the Salt master through client interfaces and should use the
correct config when doing so. We should also reuse the already-loaded
opts when instantiating LocalClient().
 2014-07-24 16:08:31 -06:00
Seth House
33043ef919 Added NetapiClient integration tests 2014-07-24 16:08:31 -06:00
Seth House
bd72c35f7c Add tests for the cmd_sync and cmd_async RunnerClient methods 2014-07-24 16:08:30 -06:00
Seth House
c34cddcfbb Move eauth_creds to class-level for reuse 2014-07-24 16:08:30 -06:00
Seth House
b077b2436e Add 'auto' eauth backend for tests 2014-07-24 16:08:30 -06:00
C. R. Oldham
9dc3f696ca Fix two RHEL7 tests 2014-07-24 14:11:03 -07:00
rallytime
7bb5ef3773 Skip lxc tests if no lxc and skip failing vt_test if running osx 2014-07-21 17:11:20 -06:00
rallytime
73b185cb72 Allow OSX to run tests with change to TMPDIR 2014-07-21 14:26:59 -06:00
Thomas S Hatch
ef277feba1 Merge pull request #14314 from cachedout/grains_raet 
Increase timeout for grains test
 2014-07-17 15:51:37 -06:00
Mike Place
919e9db946 Increase timeout for grains test 2014-07-17 13:27:08 -06:00
Aditya Kulkarni
88a873a171 Ensure tests pass on raet and zmq 2014-07-17 10:32:07 -04:00
Aditya Kulkarni
615e0b7550 Add timeouts to wait longer 2014-07-15 16:50:32 -04:00
Aditya Kulkarni
978ae5fb51 Make sure test_grain passes with raet 2014-07-15 16:27:47 -04:00
Thomas S Hatch
25a4df3566 Merge pull request #14238 from rallytime/fix_spelling 
Fix spelling error: doctring -> docstring
 2014-07-15 10:41:16 -06:00
Thomas S Hatch
4e91eee9ca Merge pull request #14228 from terminalmage/issue13873 
Fix regression in templating local files
 2014-07-15 10:38:45 -06:00
rallytime
486aa982ad Fix spelling error: doctring -> docstring 2014-07-15 09:26:55 -06:00
David Boucha
8bddefc53b Merge pull request #14229 from whiteinge/rest_cherrypy-run-sessions 
Add rest_cherrypy tests for the /run entrypoint; fix session reference when sessions are disabled
 2014-07-15 02:12:15 -06:00
Seth House
63be4efae9 Added basic smoke-tests for the rest_cherrypy /run entrypoint 2014-07-14 22:11:20 -06:00
Erik Johnson
2939eaec15 Clean up filehandle usage in file state tests 
This does a few things:

1. Change calls to open() to use salt.utils.fopen()

2. Use with blocks where applicable
 2014-07-14 21:23:06 -05:00
Erik Johnson
f847bae5a2 Add tests for templating local files 2014-07-14 21:23:06 -05:00
Seth House
2dad062f8a Move rest_cherrypy mocked methods into individual tests 2014-07-14 20:18:21 -06:00
Pedro Algarvio
698784d1e7 White-space lint fix 2014-07-15 01:43:52 +01:00
Thomas S Hatch
09f5ad951b Merge pull request #14210 from pass-by-value/raet_key_test_refactor 
Refactor salt key tests to be raet compatible
 2014-07-14 16:07:43 -06:00
Aditya Kulkarni
91943766d3 Refactor salt key tests to be raet compatible 2014-07-14 15:22:38 -04:00
Mike Place
a08849c270 Remove old-style env= tests. 2014-07-14 11:03:03 -06:00
Thomas S Hatch
7e54d0fa20 Revert "lxc refactor" 2014-07-12 11:38:03 -06:00
Thomas S Hatch
1e5a545c8c Merge pull request #14137 from mgwilliams/lxc 
lxc refactor
 2014-07-11 16:00:06 -06:00
Thomas S Hatch
da2f3543fd Skip gitfs tests 
These are running in an incosistent way, all of our local tests pass
 2014-07-11 15:17:58 -06:00
Matthew Williams
71e1522c08 WIP: continue restructure of modules.lxc 2014-07-11 19:17:55 +00:00
Matthew Williams
3a0263d551 WIP: lxc restructure 2014-07-11 18:28:37 +00:00
Thomas S Hatch
2ca17d451a me english so fail 2014-07-10 16:11:00 -06:00
Thomas S Hatch
e5fe94227f Merge pull request #14097 from mgwilliams/lxc 
add lxc integration tests
 2014-07-10 13:31:17 -06:00
Matthew Williams
e102a95b84 use a faster template (sshd) for lxc integration tests 2014-07-10 14:38:28 -04:00
Matthew Williams
298d4e6eac add lxc integration tests 2014-07-10 13:37:48 -04:00
Thomas S Hatch
af5f42a370 Merge pull request #14069 from rallytime/batch_test 
Simple integration test for batch cli command
 2014-07-10 10:06:19 -06:00
rallytime
0000859eb1 pylint fix 2014-07-09 22:31:54 -06:00
rallytime
1acf3ac3a9 Fix batch test 2014-07-09 22:00:41 -06:00
Pedro Algarvio
29fae98470 Merge pull request #14072 from terminalmage/refine-gitfs-tests 
Refine gitfs tests
 2014-07-10 00:02:28 +01:00
rallytime
1df0c20d97 Pyling fixes 2014-07-09 16:22:00 -06:00
Erik Johnson
1fd16fa434 Refine gitfs tests 
This adds a tearDown to ensure a clean copy of the repo for each test.
In addition, it removes the dependency on lexicographical order by
running a find_file() inside the two tests which require it in order to
ensure that the file exists in the gitfs cache.
 2014-07-09 16:06:36 -06:00
rallytime
56279770a9 Simple integration test to execute a batch command to help catch regressions 2014-07-09 15:41:18 -06:00
Thomas S Hatch
a852b87ff9 Merge pull request #14054 from pass-by-value/raet_test_full_returns_test 
Make sure test_full_returns passes for RAET
 2014-07-09 11:18:21 -06:00
Aditya Kulkarni
b9571b61c7 Make sure test_full_returns passes for RAET 2014-07-09 09:32:50 -06:00
Thomas S Hatch
37a14bf37c Merge pull request #14039 from terminalmage/fix-gitfs-tests 
Fix gitfs tests
 2014-07-08 20:05:01 -06:00
Erik Johnson
d942c98ef6 Fix gitfs tests 
This changes how the setUp function initializes and commits the repo
used as a gitfs remote by these tests. Instead of using the git.Git
class, it simply uses the index object to add and then commit. See here
for more info:

https://pythonhosted.org/GitPython/0.3.1/tutorial.html#the-index-object

Additionally, file_hash() and serve_file() are designed to check copies
of files that have been retrieved from the blobs, in
$cachedir/gitfs/refs/$saltenv/path/to/file. The paths have been fixed in
these two tests, and the sha1 test has been renamed to ensure that it is
executed after test_find_file, so that the file exists in the cache.
 2014-07-08 18:56:12 -06:00
Aditya Kulkarni
edfabad5e2 Skip tests if no internet connection 2014-07-08 17:16:47 -06:00
Thomas S Hatch
b7a6200708 Merge pull request #14027 from pass-by-value/ext_pillar_12647 
Make sure multiple git pillar sources work
 2014-07-08 13:41:38 -06:00