Commit Graph

2996 Commits

Author SHA1 Message Date
Thomas S Hatch
70950a1543 Merge pull request #15510 from lyft/boto_elb_resolve_error_on_deregister_instances_call
deregister_instances and register_instances methods return True/False/None
2014-09-04 15:32:45 -06: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
Thomas S Hatch
a2e8d72f21 Merge pull request #15462 from garethgreenaway/returner_experiments
Updates to returners, consolidated code.
2014-09-04 11:03:23 -06:00
Antoine Jacoutot
1ef276575f tests: recognize OpenBSD 2014-09-04 10:23:59 +02:00
Colin Johnson
754c01448e provide True, False and None returns on deregister_instances and register_instances methods 2014-09-04 05:53:52 +00:00
rallytime
155b548eae Remove unnecessary import requirements to cloud integration tests 2014-09-03 20:12:44 -06:00
Colton Myers
f8c6fc00b6 Merge branch '2014.7' into develop 2014-09-03 16:24:12 -06:00
Colton Myers
3a5f8281da Merge pull request #15490 from basepi/backport_boto
Backport boto modules/states/tests
2014-09-03 16:23:35 -06:00
Colton Myers
c7b666fe43 Bring boto state tests from develop to 2014.7 2014-09-03 15:22:55 -06:00
Colton Myers
c127b4bafe Bring boto module tests from develop to 2014.7 2014-09-03 15:22:17 -06:00
Gareth J. Greenaway
c87d91ee82 Consolidating the _get_options function from all the returners that were using it into the config module. Additionally some cleanup and ability to pass defaults to the get_returner_options function.
fixing lint issues

moving the get_options function into a utils.py under returners.  previous attempt at using a call to the salt config module doesn't work if the returner is called from the scheduler.

adding missing docstring

Unit tests were failing for SMTP returner because __opts__ was not available.  Ensuring it's available, empty, if it doesn't already exist.

removing the check and population with an empty dict for __salt__ and __opts__.  Adding an empty __opts__ to the smtp returner unit tests.
2014-09-03 13:56:48 -07:00
Mike Place
c8f67c2b89 Fix tests and lint 2014-09-03 14:17:27 -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
Thomas S Hatch
5e2544a1a4 Merge pull request #15374 from cimarronm/module_brew_consistent_run_cmd
modules.brew call with consistent user
2014-09-02 16:02:36 -06:00
Cimarron Mittelsteadt
8326182e5e TST: Updated brew module unit test to patch the appropriate __salt__ functions for the updates to brew module 2014-09-02 11:12:01 -07:00
Colton Myers
36ef47e7a2 Merge branch '2014.7' into develop
Conflicts:
	conf/minion
	salt/modules/mine.py
2014-09-02 10:43:31 -06:00
rallytime
bd59d3a6b2 Correct cloud_prep_sls reference 2014-08-31 09:31:12 -06:00
rallytime
520e5e6676 Remove 'is True' 2014-08-30 20:18:12 -06:00
rallytime
61478de6e8 First pass at allowing jenkins.py to only run cloud tests 2014-08-30 17:38:39 -06:00
btibi
dcb7d51466 syslog_ng: fix pep8 lint errors and warnings 2014-08-30 11:33:44 +02:00
btibi
e47c18203c syslog_ng: remove unused pdb import 2014-08-30 11:11:26 +02:00
Colton Myers
c12f05f83a Merge branch '2014.7' into develop
Conflicts:
	salt/modules/aptpkg.py
	salt/modules/tls.py
	salt/states/boto_asg.py
	salt/states/boto_secgroup.py
2014-08-29 16:27:00 -06:00
btibi
69b0deacf6 syslog_ng: add syslog-ng state and execution modules 2014-08-29 23:20:25 +02:00
Colton Myers
704180fd43 Merge branch '2014.7' into develop
Conflicts:
	salt/utils/cloud.py
2014-08-28 12:18:07 -06:00
rallytime
72de420e2d Tell jenkins to run integration tests for salt/runner.py 2014-08-28 10:53:22 -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
rallytime
e1dde7c574 Enable wheel integration tests in runtests.py 2014-08-27 09:34:44 -06:00
Seth House
a96d58cfba Fix failing integration tests for the wheel client 2014-08-26 19:20:25 -06:00
Thomas S Hatch
d49f46786e Merge pull request #15250 from saltstack/bp-14975
Backport #14975 to 2014.7
2014-08-26 10:11:07 -06:00
Thomas S Hatch
871bfb42e2 lint in test script 2014-08-25 15:32:06 -06:00
Thomas S Hatch
e3624fa19a Merge branch 'add_fs_cache' of https://github.com/felskrone/salt into felskrone-add_fs_cache 2014-08-25 15:19:40 -06:00
Jon Henry
5b47b0bdb7 Fix gem unit test with new proxy parameter 2014-08-25 13:55:59 -06:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
vs
45e997d020 use default path for socket instead of /tmp/... 2014-08-25 15:16:12 +02:00
vs
f50ef837fd initial add for cache-testing skript 2014-08-25 14:17:00 +02:00
Gavin Swanson
d972aeff55 Merge branch 'addCygwin' into develop 2014-08-23 15:56:32 -07: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
Aditya Kulkarni
2d98bc16aa Warn if eventlisten is unable to access socket 2014-08-21 12:53:45 -04:00
Erik Johnson
bf982d6893 Update gitfs test opts to reflect new gitfs config opts 2014-08-20 22:23:45 -05:00
Pedro Algarvio
ac7174f9f6 Merge pull request #15113 from rallytime/remove_OrderedDict
Use salt.utils.odict instead of python2.7 OrderedDict
2014-08-21 00:13:25 +01:00
Colton Myers
916141fac0 Merge branch '2014.7' into develop
Conflicts:
	tests/integration/shell/call.py
2014-08-20 14:39:31 -06:00
C. R. Oldham
5caf4e35c9 Merge pull request #15098 from s0undt3ch/issues/14979-output-file-permissions
Trim the output file as opposed to delete to keep same permissions.
2014-08-20 11:16:42 -06:00
rallytime
e7a09640fa put -C tar command back in 2014-08-20 10:07:12 -06:00
rallytime
286de2466d Remove compound matching from jenkins.py 2014-08-20 09:49:49 -06:00
rallytime
2285a10a95 Use salt.utils.odict instead of python2.7 OrderedDict 2014-08-20 09:24:52 -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
Mike Place
8e3b01f17e Merge pull request #15013 from felskrone/add_tcp_dumper_script
Add tcp dumper script
2014-08-19 13:26:42 -06:00
Nicole Thomas
37420dfed3 Merge pull request #15012 from lyft/boto_vpc-boto_secgroup-resolve-unit-test-failures
Boto vpc boto secgroup resolve unit test failures
2014-08-19 13:05:14 -06:00
Colin Johnson
9e797d6664 skip if mock not found 2014-08-19 16:19:41 +00:00
Pedro Algarvio
8baf773b78 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-08-18 05:37:27 +01:00
Pedro Algarvio
ea41586ba4 Merge branch '2014.7' into develop 2014-08-18 05:37:12 +01:00
vs
d1599b4780 more linting 2014-08-16 09:24:46 +02:00
vs
bae8d39bb1 lint fixes 2014-08-16 09:01:16 +02: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
Thomas S Hatch
fff64b37ab Merge pull request #14975 from jhenry82/issue_14304
Issue 14304: add proxy parameter to gem.installed state
2014-08-15 23:12:08 -06:00
Gavin Swanson
4eaa601f3c Added update and uninstall functions
Should be able to remove and update things now. Also doesn't always
update when installing anymore. Update now only called via
salt['cyg.update']()
2014-08-15 20:17:40 -07:00
Colin Johnson
72b9ebe304 move to LooseVersion for Boto version testing 2014-08-15 23:05:05 +00:00
Colin Johnson
c3a6f3d727 fix boto versions for boto_secgroup and boto_vpc 2014-08-15 22:57:44 +00:00
Colton Myers
932aa97e1f Merge branch '2014.7' into develop 2014-08-15 16:33:02 -06:00
Gavin Swanson
c8d19409f6 Add cygwin package installation
Currently only hadles adding packages. Does not remove packages. It is
setup to update packages any time it is run, but there is no independent
update functionality.
Curently no unit/integration testing is done. I haven't wrapped my head
around the way the mocking and stuff is done yet.
2014-08-15 14:13:22 -07:00
rallytime
b8db5ff56b Change lxc skipIf message to be more helpful 2014-08-15 14:21:09 -06:00
Colin Johnson
86bcea16ee resolve issue with boto < 2.4.0 GroupOrCIDR attributes 2014-08-15 18:58:26 +00: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
vs
12bc275388 fix mail address 2014-08-15 13:17:19 +02:00
vs
c26e50e694 more linting 2014-08-15 13:05:42 +02:00
vs
b175b705ce pylinting and cleanup 2014-08-15 13:03:26 +02:00
vs
11f544b3ba fix missing brace 2014-08-15 12:15:49 +02:00
vs
0ad1f016ed add tcp-dumper for visualzing salt-master network activity 2014-08-15 12:11:50 +02:00
Thomas S Hatch
2305a89aae Merge pull request #14986 from steverweber/slspath_fix
include trailing slash for slspath template var
2014-08-14 23:55:55 -06:00
rallytime
e8fab3d28a Fix psutil version 2014-08-14 21:22:55 -06:00
rallytime
0683c704dd Move psutil version check 2014-08-14 21:20:25 -06:00
Colin Johnson
41c51b4044 resolve issue with Ubuntu 12.0.4 failures 2014-08-15 01:12:43 +00:00
rallytime
8dca2515ee Skip virtual_memory and swap_memory tests if psutil < 0.6.0 2014-08-14 16:16:38 -06: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
steve
091c40df21 save 2014-08-14 12:40:27 -04:00
rallytime
fe5b8d22ec Fix gitpillar skipIfs 2014-08-14 10:34:38 -06:00
Jon Henry
c065ac4f50 Fix gem unit test with new proxy parameter 2014-08-14 00:22:52 -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
rallytime
f9e481e49d Add needs_daemon=False to run_tests 2014-08-12 16:57:34 -06:00
rallytime
b579247646 Add no_mock/_reason and ensure_in_syspath 2014-08-12 16:48:01 -06:00
rallytime
a0233b3ebf Fix pillar mysql test formatting 2014-08-12 16:44:33 -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
Thomas S Hatch
1a5c0c5dca Merge pull request #14895 from whiteinge/npm-cleanup
Fix npm test; npm state pylint fix
2014-08-12 11:44:42 -06:00
rallytime
d57fc99bca Move mock_ec2 decorator back to functions 2014-08-12 09:20:17 -06:00
rallytime
5fff2f9b3f Rename boto tests files to include '_test' at the end 2014-08-11 17:01:42 -06:00
Nicole Thomas
64ee26aa57 Merge pull request #14897 from rallytime/boto_test_fixes
Update imports and skipIfs on boto unit tests
2014-08-11 17:01:01 -06:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop
Conflicts:
	salt/states/win_update.py
2014-08-11 18:23:44 -04:00
Pedro Algarvio
09acfae48e Bring the global variables more into their context 2014-08-11 22:25:21 +01:00
rallytime
cc5c3bc1ad Update imports and skipIfs on boto unit tests 2014-08-11 12:57:45 -06:00
Chris Rebert
7da0f0a8b6 fix "retreived" typos 2014-08-11 11:52:30 -07:00
Chris Rebert
b7ce0dbe60 more typos after disabling case-sensitivity 2014-08-11 10:57:41 -07:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
2014-08-11 10:46:43 -07:00
Thomas S Hatch
787827618b Merge branch '2014.7' into develop 2014-08-11 11:43:33 -06:00
Seth House
11f4e20bd8 Fix incorrect call to state.single in npm pkgs test 2014-08-11 11:03:00 -04:00
Pedro Algarvio
7b2126c550 Make pylint ignore "non issues" 2014-08-10 06:06:41 +01:00
Pedro Algarvio
9ebe6f3873 Test exc_info per handler 2014-08-10 03:44:53 +01:00
Thomas S Hatch
b166b0c7c1 Merge branch '2014.7' into develop 2014-08-08 15:48:01 -06:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Thomas S Hatch
b0561a703b Revert "Pull out pending_events changes and reuse"
This reverts commit e832a3a17f.
2014-08-08 12:49:46 -06:00
Pedro Algarvio
c9be462f00 Skip tests if real mock library is not available 2014-08-08 00:52:47 +01:00
Pedro Algarvio
a399e62ca2 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
97f1b00818 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
faf3157637 Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
21141af46a Skip tests if real mock library is not available 2014-08-08 00:46:21 +01:00
Pedro Algarvio
239b2480ae Skip tests if real mock library is not available 2014-08-08 00:46:21 +01: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
429cc40376 Minor checks to the saltsh.py repl 2014-08-07 14:24:30 -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
Thomas S Hatch
d6e3e31a22 lint fixes 2014-08-05 12:08:05 -06:00
Colin Johnson
d26b671b00 add vpc support in boto_secgroup execution module 2014-08-05 03:45:00 +00:00
Thomas S Hatch
d279889abf Merge pull request #14701 from lyft/asg-support-security-group-names
boto_asg - add support for use of security group names in launch configs
2014-08-04 10:57:06 -06:00
Thomas S Hatch
77d709a29c Merge pull request #14601 from lyft/provide-vpc-exists-support
Provide vpc exists support
2014-08-04 10:16:38 -06:00
Thomas S Hatch
1bd88cab28 Merge pull request #14535 from steverweber/template_var
add two vars to the templates slspath and tplpath
2014-08-04 10:06:07 -06:00
Colin Johnson
8dd88066f7 boto_asg now support use of security group names in launch configs 2014-08-04 00:04:20 +00:00
Colton Myers
0307fdbe9a Merge branch '2014.7' into develop
Conflicts:
	salt/runners/manage.py
2014-08-01 10:52:52 -06:00
Colton Myers
2bfcbe01d0 Merge pull request #14661 from rallytime/fix_rhel7_test
Add GPG key file to integration tests
2014-07-31 16:34:47 -06:00
Michael Birtwell
32acb7aeae Pull out pending_events changes and reuse
PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
2014-07-31 12:23:38 -06:00
rallytime
f5597010ca Add GPG key file to integration tests 2014-07-31 10:57:49 -06:00
Pedro Algarvio
586642576a Add another which only changes the noc 2014-07-30 19:34:00 +01:00
Pedro Algarvio
a53ca96c76 Add another example for version comparison 2014-07-30 19:34:00 +01:00
Pedro Algarvio
4ccb73abac Add another version example to the tests 2014-07-30 19:33:59 +01:00
Pedro Algarvio
b24e1b9c49 Support a minor bugfix attribute in the version string 2014-07-30 19:33:59 +01:00
Pedro Algarvio
3a16b42eb9 Add another which only changes the noc 2014-07-30 18:10:22 +01:00
Pedro Algarvio
7a77942a82 Add another example for version comparison 2014-07-30 18:10:16 +01:00
Pedro Algarvio
fc239f8cd9 Add another version example to the tests 2014-07-30 18:10:09 +01:00
Pedro Algarvio
827ccd5338 Support a minor bugfix attribute in the version string 2014-07-30 18:10:02 +01:00
Colin Johnson
3bcfd4bb0d unit tests for boto_vpc module 2014-07-30 07:29:45 +00:00
steverweber
0b764c5b69 add two vars to the templates slspath and tplpath 2014-07-29 09:53:19 -04: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
d7d8beabb8 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-25 19:55:43 -06:00
Seth House
adabf74852 Added utils module for working with hash functions 2014-07-25 16:12:37 -06:00
Thomas S Hatch
6e575491ee Merge pull request #14506 from whiteinge/netapi-client-config
Load netapi modules using client config instead of master config
2014-07-25 15:49:02 -06:00
Seth House
ac6c7d0d6d Added utils-style IP-check functions to the network module 2014-07-25 15:20:14 -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
Thomas S Hatch
263ed1ad90 Merge pull request #14503 from robmessick/gem_state_prereleases
Add support for pre_releases argument to the gem state
2014-07-25 14:26:20 -06:00
Thomas S Hatch
641eaa7b03 Merge pull request #14298 from mbirtwell/dont_drop_events_during_gather_job_info
Dont drop events during gather job info
2014-07-25 14:04:44 -06:00
Thomas S Hatch
db5e572760 Merge pull request #14269 from whiteinge/test-dotlookup-notation
Add a bug fix plus tests for calling functions in Jinja via dot-lookup notation
2014-07-25 14:04:03 -06:00
Rob Messick
4549ef25a2 Add support for pre_releases argument to the gem state 2014-07-25 12:30:42 -07:00
steverweber
bf8f936fa4 fix issues with keepalive minion 2014-07-25 15:13:05 -04:00
Thomas S Hatch
a00e84b556 Merge branch '2014.7' into develop 2014-07-25 12:55:42 -06:00
C. R. Oldham
253de7a995 PyLint fix. 2014-07-25 12:48:07 -06:00
Seth House
0d8cc41c61 Added tests for calling functions via Jinja with dot-lookup syntax
Yay!
2014-07-25 12:27:45 -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
Colton Myers
e7bd8bf00d Merge branch '2014.7' into develop 2014-07-25 10:43:55 -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
Thomas S Hatch
558e2283d1 Merge pull request #14474 from robmessick/issue14469
add optional pre_releases argument to gem.install
2014-07-25 10:34:38 -06:00
Thomas S Hatch
8e0d8a7b9f Merge branch '2014.7' into develop 2014-07-25 10:30:07 -06:00
Thomas S Hatch
0577b4070b lint fix 2014-07-25 10:21:31 -06:00
Thomas S Hatch
f3e6841401 Merge pull request #14452 from s0undt3ch/hotfix/osx-pyt-nr
Skip test on Darwin after making an effort
2014-07-25 10:20:10 -06:00
Rob Messick
74cf92331b add optional pre_releases argument to gem.install 2014-07-24 17:26:27 -07: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
Seth House
fed58155bc Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-24 16:04:39 -06:00
C. R. Oldham
9dc3f696ca Fix two RHEL7 tests 2014-07-24 14:11:03 -07:00
Pedro Algarvio
ea01af39b4 Skip test on Darwin after making an effort 2014-07-24 13:12:46 +01:00
Colin Johnson
c8e8bf1577 LYFT-14491 - unit tests for rule modification 2014-07-23 22:59:38 +00:00
Colin Johnson
2ad52a5c06 LYFT-14491 - states unit test for rule modification 2014-07-23 22:59:28 +00:00
rallytime
9b9a60efea Skip vt_test in os x - still needs some work to run 2014-07-23 14:40:03 -06:00
Nicole Thomas
486dbe3476 Merge pull request #14389 from s0undt3ch/hotfix/osx-pyt-nr
Allow the VT tests to run on OSX
2014-07-23 14:38:58 -06:00
Pedro Algarvio
6c7e39dfcd Factor out into a function the current number of PTY's detection code 2014-07-23 19:43:18 +01:00
rallytime
51c7b95e6f Give rhel5 a chance to pass the cache tests 2014-07-22 15:38:54 -06:00
rallytime
a3da60def4 Remove unnecessary print statement 2014-07-22 12:16:39 -06:00
Pedro Algarvio
fa2149e1da Allow the VT tests to run on OSX 2014-07-22 15:20:03 +01: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
rallytime
c70c8ee5aa Remove cloud_config tests for deprecated arguments 2014-07-17 16:41:11 -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
Thomas S Hatch
5a8a5c3485 Merge pull request #14300 from pass-by-value/more_matcher_test_fixes
Ensure tests pass on raet and zmq
2014-07-17 14:19:39 -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
Michael Birtwell
e832a3a17f Pull out pending_events changes and reuse
PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
2014-07-17 13:18:30 +01:00
rallytime
81e06fa252 Removed deprecated functions in salt/modules/ps.py 2014-07-16 12:49:45 -06:00
Colton Myers
11bfbd7a85 Merge pull request #14272 from rallytime/deprecate_check_dns
Deprecate check_dns
2014-07-16 11:44:32 -06:00
rallytime
dfb8894e6a Remove unused imports 2014-07-16 06:41:28 -06:00
rallytime
6733f45924 Removed deprecated references to check_dns 2014-07-16 06:26:08 -06:00
rallytime
1c3737a883 Remove remaining references and tests to no_site_packages 2014-07-16 06:00:08 -06:00
rallytime
4d329296b0 Remove unused import 2014-07-15 18:15:58 -06:00
rallytime
534f3df900 Remove test for no_site_packages deprecation 2014-07-15 17:28:40 -06:00
Thomas S Hatch
6abccbc0cf fix this better, don't use clean_proc from master.py. 2014-07-15 15:06:15 -06:00
Mike Place
6b572eaa4b Merge pull request #14253 from pass-by-value/matcher_test_raet_compat
Matcher test raet compat
2014-07-15 14:53:57 -06:00