valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
36,333 Commits 24 Branches 182 Tags 341 MiB
921fd6362c
Commit Graph

2841 Commits

Author SHA1 Message Date
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
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
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
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