valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,440 Commits 24 Branches 182 Tags 341 MiB
b618a5c07d
Commit Graph

2588 Commits

Author SHA1 Message Date
rallytime
527bc3e491 Pylint fix 2016-03-28 11:24:45 -06:00
rallytime
e9abd2d420 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/rh_service.py
 2016-03-28 10:51:23 -06:00
Mike Place
6b8b8b51c0 Merge pull request #32154 from Ch3LL/ch3ll_pam_2015.5 
Add integration tests for salt-api using pam eauth
 2016-03-28 10:06:36 -06:00
rallytime
635263ab1c Finish up mac_keychain tests 2016-03-26 20:30:22 -06:00
Ch3LL
b8f271bdc9 add mac_keychain test 2016-03-26 20:30:22 -06:00
twangboy
86de04b08c Fix typo in test_latest_version 2016-03-25 15:28:46 -06:00
twangboy
9c97057b84 Add destructiveTest decorators 2016-03-25 15:28:46 -06:00
twangboy
770b45ca35 Fix class attribute 2016-03-25 15:28:46 -06:00
twangboy
ada508f8eb Improve cleanup 2016-03-25 15:28:46 -06:00
twangboy
b63986d2ce Add remaining integration tests 2016-03-25 15:28:46 -06:00
Nicole Thomas
abace3aa5f Merge pull request #32151 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-25 14:06:15 -06:00
Ch3LL
ba605b0128 fix more pylint and add ability to close cherrypy engine 2016-03-25 12:06:39 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
Mike Place
e24d285436 Merge pull request #32092 from twangboy/mac_service_int 
Integration tests for mac_service.py
 2016-03-25 10:39:42 -06:00
Nicole Thomas
76b843cf9e Merge pull request #32136 from jtand/arch_alternatives 
Arch does not have the alternatives directory
 2016-03-25 09:24:56 -06:00
Nicole Thomas
37f2a98dc9 Merge pull request #32140 from rallytime/bp-32110 
Back-port #32110 to 2016.3
 2016-03-25 09:22:30 -06:00
Mike Place
377c102470 Merge pull request #31790 from twangboy/mac_system_int 
Integration tests for mac_system
 2016-03-24 17:11:29 -06:00
rallytime
58c844a7d7 Add mac_desktop integration tests 
- Updates mac_desktop module to use cmd.run_all
- Updates current mac_desktop_test unit tests with cmd.run_all change
- Adds integration tests for mac_desktop execution module
 2016-03-24 17:02:53 -06:00
Justin Anderson
a0d1f42337 Lint fix 2016-03-24 16:33:18 -06:00
Justin Anderson
291a5695d3 Arch does not have the alternatives directory 2016-03-24 16:12:01 -06:00
Mike Place
6b5c65eafa Merge pull request #32093 from twangboy/mac_softwareupdate_int 
Use class attributes in mac_softwareupdate tests
 2016-03-24 15:55:24 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00
Mike Place
1545b80017 Merge pull request #32034 from twangboy/mac_pkgutil_int 
Integration tests for mac_pkgutil
 2016-03-24 15:44:51 -06:00
Mike Place
59fde81457 Merge pull request #32094 from twangboy/mac_power_int 
Use class attributes in mac_power tests
 2016-03-24 15:33:30 -06:00
Thomas S Hatch
81d267bcfd try to change the test run to always clean the thindir 2016-03-24 10:40:23 -06:00
twangboy
3eefd8ccad Use class attributes instead of global variables 2016-03-23 15:37:59 -06:00
twangboy
79963c9020 Add global variables to setUp 2016-03-23 15:37:59 -06:00
twangboy
e306bc40de Fix pylint error... maybe 2016-03-23 15:37:59 -06:00
twangboy
357911cc8f Fix decorator 2016-03-23 15:37:59 -06:00
twangboy
6ae27945fd Add disabled decorator 2016-03-23 15:37:59 -06:00
twangboy
b04229430c Improve integration tests 2016-03-23 15:37:59 -06:00
twangboy
a0943c136f Fix some pylint errors 2016-03-23 15:37:59 -06:00
twangboy
d45def946a Finish integration tests for mac_system 
Fixes service.start and service.stop
Fixes system.get_boot_arch
Adds 'yes' and 'no' to validate_enabled function in mac_utils
 2016-03-23 15:37:59 -06:00
twangboy
9bb49659b5 Explicitely call salt mac_utils functions 2016-03-23 15:30:56 -06:00
twangboy
00488190a4 Use class attributes instead of global variables 2016-03-23 15:15:41 -06:00
twangboy
d1505bc892 Use class attributes instead of global variables 2016-03-23 15:03:04 -06:00
twangboy
fa59c50ba9 Change from global to class attributes 2016-03-23 14:52:48 -06:00
twangboy
a5fd2dd29b Add global variables to setUp 2016-03-23 12:16:12 -06:00
twangboy
9dcaba7e67 Add global variables to setUp 2016-03-23 12:10:05 -06:00
twangboy
44223d6402 Fix my fix 2016-03-23 11:56:49 -06:00
twangboy
28c1397913 Fix deprecation warning 
Incorrectly passing kwargs to run_function
 2016-03-23 11:52:49 -06:00
twangboy
9308ad1e7a Fix test_disabled 
Use get instead of pop
 2016-03-23 11:19:02 -06:00
twangboy
fef8f90919 Add remaining integration tests 2016-03-23 11:13:55 -06:00
Mike Place
e19fe847bd Merge pull request #32062 from rallytime/mac-assistive-tests 
Mac assistive tests
 2016-03-23 09:51:36 -06:00
twangboy
75cf459d71 Change list to return a dict 2016-03-23 09:50:56 -06:00
Nicole Thomas
57cf405fd6 Merge pull request #31552 from alprs/fix-localectl 
Bring back localectl parsing in locale module for when dbus module is unavailable
 2016-03-23 09:47:27 -06:00
twangboy
ed8add068e Add integration tests basic framework 2016-03-22 17:29:32 -06:00
rallytime
88ba210f86 Add mac_assistive integration tests 
- Updates mac_assistive module to use cmd.run_all
- Updates current mac_assistive_test unit tests with cmd.run_all change
- Adds module integration tests for mac_assistive execution module
 2016-03-22 14:11:40 -06:00
Justin Anderson
e86797731a Removed some unused imports for lint fixes 2016-03-22 09:15:20 -06:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
twangboy
5658753a5f Add already installed check 2016-03-21 17:33:25 -06:00
twangboy
3b05583928 Remove unecessary SaltInvocationError 2016-03-21 17:22:38 -06:00
twangboy
523e125436 Fix forget portion 2016-03-21 16:54:51 -06:00
twangboy
66ea15c0be Fix install_forget test... again 2016-03-21 16:51:48 -06:00
twangboy
fb78f539b7 Fix install_forget test 2016-03-21 16:49:31 -06:00
twangboy
77920265d1 Add documentation/tests for forget 2016-03-21 16:45:29 -06:00
twangboy
58cd2a7c9a Add some tearDown functions 2016-03-21 16:08:03 -06:00
twangboy
b4c3f59929 Fix test 2016-03-21 15:50:19 -06:00
twangboy
ee7ab8500d Add import os 2016-03-21 15:43:30 -06:00
Nicole Thomas
750e970d57 Merge pull request #32028 from rallytime/merge-31884 
Merge #31884 with pylint fixes
 2016-03-21 15:19:57 -06:00
twangboy
97196e672b Fix test_install integration test 2016-03-21 15:07:06 -06:00
twangboy
933e275b3a Add integration tests 2016-03-21 15:03:31 -06:00
rallytime
92ea2709d7 More pylint fixes 2016-03-21 14:55:03 -06:00
Mike Place
0a1753b83d Merge pull request #31885 from Ch3LL/add_mac_brew_tests 
renamed brew.py to mac_brew.py and added tests
 2016-03-21 14:22:47 -06:00
Mike Place
a496806fa2 Merge pull request #32000 from twangboy/mac_power_int 
Integration tests for mac_power.py
 2016-03-21 14:18:57 -06:00
rallytime
3e61603d5b Pylint fix for #31884 
Merges #31884
 2016-03-21 14:18:29 -06:00
Ch3LL
aa519814f2 reverse the format indices 2016-03-21 14:17:27 -06:00
Ch3LL
3f2b851203 add more tests for mac_group 2016-03-21 14:17:27 -06:00
Nicole Thomas
d85dfbea50 Merge pull request #32001 from alprs/fix-alternatives_state_integration_tests 
Add integration test for alternatives state
 2016-03-21 13:40:45 -06:00
Andreas Lutro
195fd53713 Add a basic integration test for locale module 2016-03-21 20:22:16 +01:00
twangboy
bed7178f18 Fix mac_pkgutil module 2016-03-21 12:10:28 -06:00
Mike Place
a940c64981 Merge pull request #31994 from twangboy/mac_softwareupdate_int 
Integration tests for mac_softwareupdate.py
 2016-03-21 12:01:14 -06:00
Andreas Lutro
e9fe661e72 add integration test for alternatives state 
the alternatives state module has been through some contradictory
changes recently. an integration test should help validate that it
actually works.
 2016-03-21 17:53:01 +01:00
twangboy
c011a176f5 Add integration tests 2016-03-19 17:04:42 -06:00
twangboy
3d7ff12019 Fix line lengths 2016-03-18 17:59:07 -06:00
twangboy
787835a13a Fix tests for sleep functions 2016-03-18 17:57:02 -06:00
twangboy
a15aaff241 Add remaining integration tests 2016-03-18 17:36:49 -06:00
twangboy
2517abafca Integration tests for sleep functions 2016-03-18 17:11:35 -06:00
twangboy
ed1fbecfea Integration test framework 2016-03-18 15:55:57 -06:00
twangboy
894151b334 Fix test_schedule test 2016-03-18 14:53:26 -06:00
twangboy
0099ccb256 Finished integration tests 2016-03-18 14:42:03 -06:00
twangboy
0bf1672daf Fix set_catalog function 2016-03-18 14:40:03 -06:00
twangboy
fcf0ce2c7b Fix get_catalog 2016-03-18 14:29:21 -06:00
twangboy
73f51a39ed Add checks to download 2016-03-18 14:22:15 -06:00
twangboy
182b80d67e Refactor update 2016-03-18 14:12:31 -06:00
twangboy
12668fe447 Fix integration tests 
Code refactoring
Put cmd in lists
 2016-03-18 13:53:40 -06:00
twangboy
00e6aaa2f0 Use available 2016-03-18 13:06:19 -06:00
rallytime
fa4650523e Pylint fixes 2016-03-18 12:21:09 -06:00
twangboy
972e11db24 Improve error handling for mac_softwareupdate 2016-03-18 11:30:33 -06:00
twangboy
56c0abc4a5 Fix list_upgrades test 2016-03-18 11:30:33 -06:00
twangboy
3114357b13 Add integration tests for mac_softwareupdate 2016-03-18 11:30:33 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
rallytime
98267ca100 Fix pylint for #31886 
Merges #31886
 2016-03-17 09:01:59 -06:00
Ch3LL
1a2a79113b fix pylint 2016-03-16 21:23:10 -06:00
Ch3LL
b761059405 add absolute_import 2016-03-16 20:58:41 -06:00
Ch3LL
5bcc5b2f21 fix pylint and remove super() 2016-03-16 11:44:55 -06:00
rallytime
35b2076584 Pylint fixes 2016-03-15 14:55:35 -06:00
Erik Johnson
394410e2b0 Add integration test for depends decorator 2016-03-14 22:16:10 -05:00
Ch3LL
2d4dc4da05 add teardown call 2016-03-14 16:45:27 -06:00
Ch3LL
d115878714 fix pylint error 2016-03-14 13:45:59 -06:00
root
4c1ab082b6 add pam salt-api tests 2016-03-14 19:19:06 +00:00
Ch3LL
3c03d9bd57 add mac_defaults test 2016-03-10 16:34:18 -07:00
Ch3LL
29f0c65f6f renamed brew.py to mac_brew.py and added tests 2016-03-10 16:27:40 -07:00
rallytime
fe7ff0ebfa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/__init__.py
  - salt/returners/smtp_return.py
 2016-03-10 13:13:35 -07:00
Ch3LL
910f0d9ffc change pkg name to less for suse 2016-03-10 11:18:44 -07:00
Justin Findlay
e0abe23c7e states.ssh int tests: run both test cases manually 2016-03-10 10:57:21 -07:00
Justin Findlay
d33b365984 states.pkg int tests: add pkgs for MacOS 2016-03-10 10:57:21 -07:00
Justin Findlay
431a247b66 states.cmd int tests: echo is more portable than true 2016-03-10 10:57:21 -07:00
Justin Findlay
7c48cf7ea6 states.user int tests: check MacOS primary group 2016-03-10 10:57:20 -07:00
Justin Findlay
5d5ce619b7 states.user int tests: disable GECOS for MacOS 2016-03-10 10:57:20 -07:00
Justin Findlay
aa61e1056f states.file int tests: find root's primary group 2016-03-10 10:57:20 -07:00
Justin Findlay
2fe1160143 modules.mac_user.primary_group: add integration test 2016-03-10 10:57:19 -07:00
Justin Findlay
5905518ee5 modules.mac_user int tests: fix comment typo 2016-03-10 10:57:19 -07:00
Justin Findlay
fea37b303e modules.mac_user int tests: move common decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
e53ae6c44e modules.useradd.primary_group: add integration test 2016-03-10 10:57:19 -07:00
Justin Findlay
ba19f395d1 modules.useradd int tests: disable testcase on nonlinux 2016-03-10 10:57:19 -07:00
Justin Findlay
ddea2361de modules.useradd int tests: move decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
f69ab83623 modules.disk int tests: mtab not used on darwin 2016-03-10 10:57:19 -07:00
Justin Findlay
d818810200 modules.disk int tests: move decorators to class 2016-03-10 10:57:19 -07:00
Justin Findlay
bdb210dc13 modules.disk int tests: assert darwin disk usage 2016-03-10 10:57:19 -07:00
Justin Findlay
73ad02e917 modules.disk: run both integration test cases manually 2016-03-10 10:57:19 -07:00
Justin Findlay
2f1c0cf809 shell tests: strip whitespace from shell return 2016-03-10 10:57:19 -07:00
Justin Findlay
c94dfb870f shell tests: comment on shell return data 2016-03-10 10:57:19 -07:00
Justin Findlay
4028d80eee tests...runtests_helpers: use system tmpdir 2016-03-10 10:57:18 -07:00
Justin Findlay
6b99798b1e tests.integration: use system tmpdir on darwin 2016-03-10 10:57:18 -07:00
rallytime
838dc12b77 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/exceptions.py
  - salt/pillar/foreman.py
  - salt/returners/local_cache.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py

The merge conflicts in salt/cli/daemons.py are still present in this commit.
@s0undt3ch is going to resolve them after this commit.
 2016-03-08 10:14:32 -07:00
rallytime
6559ea15b0 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/glossary.rst
  - salt/config.py
  - tests/unit/modules/gpg_test.py
 2016-03-06 10:59:46 -07:00
rallytime
beb9d0fe84 Ensure all integration test classes and funcs are documented w/examples 2016-03-04 12:13:27 -07:00
Erik Johnson
da954d7b92 Add integration test for packages with epoch in version 
This starts with cent7, but later I can add cent6 as well.
 2016-03-03 15:40:22 -06:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Denys Havrysh
86433f2378 Revert changes in files used by roots_test.py integration test 2016-03-02 10:00:45 +02:00
Denys Havrysh
e7a8dbf498 Remove trailing white spaces in tests files 2016-03-01 17:40:02 +02:00
Mike Place
ada5ab344d Merge pull request #31561 from jtand/beacons_test_fix 
Skipped test
 2016-02-29 21:11:22 -07:00
justinta89
196dd4db99 Skipped test 2016-02-29 14:21:19 -07:00
rallytime
b683df9b82 Pylint fix 2016-02-29 11:12:55 -07:00
rallytime
24505d2dcf Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/fileclient.py
  - salt/minion.py
 2016-02-29 10:47:40 -07:00
Erik Johnson
0d352bbc16 Add fileclient tests 2016-02-29 01:05:33 -06:00
Ch3LL
29a53f4353 rename methods in pkg states test 2016-02-26 06:54:01 +09:00
Nicole Thomas
625da0d261 Merge pull request #31471 from cachedout/issue_31427 
Correct issue where duplicate items in grains list during state run will result in duplicate grains
 2016-02-25 13:15:20 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Mike Place
fb1ef92e2b Merge pull request #31411 from jtand/beacons_tests 
Added some beacons execution module integration tests
 2016-02-25 09:16:26 -07:00
Mike Place
30eb5fccf7 Additional tests, but disable the test for distinct lists, because of a problem with context in test suite 2016-02-24 13:53:49 -07:00
Mike Place
3d2aec05e5 Check for duplicate grains during list insertion 
Insert grains into context so that we can know if we're duplicating during multiple inserts in a state run.

Refs #31427
 2016-02-24 11:43:24 -07:00
Mike Place
987dd89979 Merge pull request #31445 from rallytime/fix-31366 
Only use LONGSIZE in rpm.info if available. Otherwise, use SIZE.
 2016-02-24 11:35:31 -07:00
Mike Place
979c8b4faa Merge pull request #31464 from Ch3LL/fix_int_test 
integartion test: ensure decorator only runs on one method and not class
 2016-02-24 11:35:00 -07:00
justinta89
7d32b56015 Added some more checks to verify beacon changes were actually happening 2016-02-24 10:38:23 -07:00
justinta89
2da5285c03 Added codeauthor 2016-02-24 09:56:11 -07:00
Ch3LL
a387d175d8 integartion test- ensure decorator only runs on one method and not entire class 2016-02-25 01:55:35 +09:00
rallytime
9965fe188a Added to pkg.info_installed test for RedHat and Suse systems 2016-02-24 09:50:52 -07:00
justinta89
fd1e2838ea Lint 2016-02-23 19:40:42 -07:00
justinta89
421a112914 Added config_dir to test minion config 2016-02-23 19:40:22 -07:00
justinta89
bf6a4c0983 Fixed lint error 2016-02-23 16:20:06 -07:00
justinta89
3566fbbcca More updates to beacons test 2016-02-23 16:19:07 -07:00
justinta89
37c4bf22d2 Updated beacons integration test 2016-02-23 15:46:21 -07:00
rallytime
1931c61563 Only run this pkg.info_installed test on distros that have that func 2016-02-23 15:22:14 -07:00
rallytime
0488668a00 Fix lowpkg.info function for Ubuntu 12 - make sure we have a pkg name 
Fixes #31370
 2016-02-23 11:09:36 -07:00
justinta89
6db628be1a Basic integration tests for beacons execution module 2016-02-22 11:22:34 -07:00
Mike Place
e1ade05e54 Merge pull request #31355 from rallytime/fix-31330 
Fix orchestrate outputter when retcode is appended to orchestrate run
 2016-02-22 11:13:07 -07:00
justinta89
3b238c2e68 Started adding beacons execution module tests 2016-02-22 08:53:02 -07:00
Justin Findlay
8623c24335 add integration tests for minion blackout 
Related to #30868.
 2016-02-19 18:04:31 -07:00
rallytime
28763be519 Remove unused import 2016-02-19 09:51:18 -07:00
rallytime
9b52e39e90 Add testcase for state.orchestrate output 2016-02-19 09:14:46 -07:00
rallytime
7ea9dacbdd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/beacons/inotify.py
  - salt/beacons/load.py
  - salt/minion.py
  - salt/modules/win_update.py
  - salt/modules/yumpkg.py
  - salt/utils/pkg/rpm.py
 2016-02-18 11:10:44 -07:00
Ch3LL
da9bca625e pkg.latest epoch test for 2016 2016-02-17 09:51:11 -07:00
Mike Place
c5e5af827c Merge pull request #31171 from Ch3LL/megan-20158 
added logic to check for installed package
 2016-02-12 15:10:21 -07:00
Ch3LL
9204e3f562 add integration test for issue 30934w 2016-02-12 12:21:50 -07:00
Ch3LL
a12e2f566b fix lint error 2016-02-12 11:38:29 -07:00
Ch3LL
a123efd4ef added logic to check for installed package 2016-02-12 11:01:35 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Mike Place
b831e0a865 Merge pull request #31131 from Ch3LL/megan-20158 
integration test for issue #31014
 2016-02-11 10:33:23 -07:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
justinta89
a5eac47b25 Changed npm integration test to install request. 
Later versions of npm were having trouble installing pm2 with the git link.
 2016-02-10 14:31:16 -07:00
Colton Myers
67e17b3022 Revert "Deprecated code removed. " 2016-02-10 11:40:48 -07:00
justinta89
56efb2d06a File state born deprecations. 
Backport of #30988
 2016-02-08 10:13:15 -07:00
justinta89
7a4be37c06 data.py code deprecations and minor test changes 2016-02-05 15:11:26 -07:00
Erik Johnson
58c4c01743 Add __role to master opts for gitfs integration tests 2016-02-02 21:58:50 -06:00
Erik Johnson
ef14956db0 Integration test for #30820 2016-02-02 15:34:19 -06:00
justinta89
9b5ce69a54 SyntaxError not appropriately caught. Further testing shows that python2.4 will use print() without an error. 2016-02-01 10:34:24 -07:00
justinta89
0acb145aa1 Adjusting script for cmd.script test 
After #29964 was merged the cmd.script and cmd.script_retcode tests on centos 5
started failing because the /usr/bin/env python version is the system default.
The script used print_fuction from __futures__ which was not introduced until
python2.6.

@The-Loeki, I noticed this after your changes to cmdmod function. If you have
thoughts or comments as to why this behavior changed after that, I'm all ears.
othersie, this should take care of the failures on centos 5 on jenkins.
 2016-01-29 11:52:17 -07:00
Nicole Thomas
05349071dc Merge pull request #30503 from StackPointCloud/profitbricks-cloud-provider 
Adds cloud provider support for ProfitBricks
 2016-01-25 11:28:41 -07:00
Ethan Devenport
de7d1666f6 Updates made after PR review: 
* Improved and cleaned up documentation.
* Removed unnecessary namespaces.
* Made to fail when no ssh_host is found.
* Cleared pylint violations.
 2016-01-25 18:02:10 +00:00
Colton Myers
cb8bf91944 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/configuration/master.rst
    doc/topics/cloud/linode.rst
    salt/cloud/clouds/linode.py
    salt/modules/rh_ip.py
    salt/renderers/pyobjects.py
    salt/states/file.py
 2016-01-21 17:42:50 -07:00
Mike Place
cdc731b8c5 Merge pull request #30521 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-01-21 16:05:03 -07:00
Ethan Devenport
44491f69cf Adds cloud provider support for ProfitBricks Cloud Computing Infrastructure Services. 2016-01-21 22:52:25 +00:00
Colton Myers
117fb205de Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    tests/unit/modules/boto_vpc_test.py
 2016-01-21 14:37:32 -07:00
Erik Johnson
393015edbb Remove git.list_worktrees tests 
These are being added back as unit tests.
 2016-01-21 15:13:02 -06:00
Justin Findlay
66f06f2bd3 disable pkgrepo test for ubuntu 15.10+ 2016-01-21 10:55:37 -07:00
Justin Findlay
fb9972f590 modules.pkg: disable repo int test for ubuntu 15.10 2016-01-19 15:27:12 -07:00
Stephen D. Spencer
18b4b829e9 . adjust regex to account for the presence/absence of version strings on 
module names (depends on whether or not they're used in the requirements
file)

. finish generalizing pip_successful_install utility function
 2015-12-28 18:48:16 +00:00
Stephen D. Spencer
7373758237 fix indentiation 2015-12-28 18:02:24 +00:00
Stephen D. Spencer
22e89838f2 testing against stdout of a cli utility is for the birds. But I think 
these tests are properly capturing "Success" messages from pip
c.2013-c.2015
 2015-12-28 17:19:05 +00:00
Stephen D. Spencer
4ccfa921b3 add re.DOTALL flag to regex 2015-12-28 15:57:55 +00:00
Stephen D. Spencer
84031b6ce0 additional integration tests to verify chained requirements work 
properly when used in a list of requirements files
 2015-12-28 09:30:19 +00:00
Stephen D. Spencer
878def94fd pip,requirements filej chain support + requirements list arg support 
modules.pip:
 . `requirements` argument now properly supports requirements file
 chaining by default--`no_chown` not required)
 . `requirements` argument can be formed as a list
 . `requirements` files can still be formed as a comma-delimited list
 . both list structures support requirements file chaining

states.virtualenv_mod:
 . had to give states.virtualenv.managed() a little bit of attention to
 provide a cwd argument for modules.pip.installed().  This is done via
 os.path.dirname(os.path.abspath(requirements)) if a requirements
 argument is present

 tests.integration.modules.pip:
    . added:
        test_requirements_as_list__sans_no_chown___absolute_file_path
        test_requirements_as_list__sans_no_chown___non_absolute_file_path
        test_chained_requirements__sans_no_chown___absolute_file_path
        test_chained_requirements__sans_no_chown___non_absolute_file_path
    . all tests passed before commit
 2015-12-26 21:30:27 -06:00
Mike Place
c19782a184 Merge pull request #29853 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-12-22 08:05:49 -07:00
Sergey Kizunov
793c0bef75 Fixed Windows salt-master memory leaks in logger 
__process_multiprocessing_logging_queue:
- A leak was observed in this process on Windows. On Windows, creating a
new process doesn't fork (copy the parent process image). Due to this, we
need to setup extended logging inside this process. The leak was due to
the temp null and temp logging handlers being active which just store
messages but don't process them. Setting up extended logging removes
those handlers and fixes the leak (as well as properly dealing with
incoming logging messages).

setup_multiprocessing_logging:
- A leak was obversed in processes that used this on Windows. Similar
to above, due to lack of fork, the new process will have the temp null
and temp logging handlers enabled, causing the leak. In this function,
removing those handlers prevents the leak.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-12-20 09:05:19 -06:00
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
 2015-12-18 15:00:24 -07:00
Thomas S Hatch
ab61f78295 Merge pull request #29775 from lyft/listen-id-declaration-resolution-stable 
Change listen requisite resolution from name to ID declaration
 2015-12-16 15:56:03 -07:00
Paul Fisher
ff3a809c11 Change listen requisite resolution from name to ID declaration 2015-12-16 13:54:49 -08:00
Mike Place
83df4c4c75 Skip refresh db test if upstream repo does not repsond. 2015-12-16 10:23:10 -07:00
Craig Rodrigues
381e8cc144 Use print as a function [PEP 3105]. 
This reduces warnings from the 2to3 utility
and future proofs the code when it is time to move to Python 3.
 2015-12-04 16:17:35 -08:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
 2015-12-01 15:31:03 -07:00
Mike Place
39667fda12 Merge pull request #29240 from clan/linux_acl 
handle acl_type [[d]efault:][user|group|mask|other]
 2015-12-01 10:56:20 -07:00
Mike Place
7e424e10f2 Merge pull request #28054 from dr4Ke/custom_grains_deep_merge 
loader uses a deep dictionary merge for the grains (core and customs)
 2015-12-01 10:33:52 -07:00
Z. Liu
02429aca69 handle acl_type [[d]efault:][user|group|mask|other] 2015-12-01 14:55:08 +08:00
Mike Place
d651d7167e Merge pull request #29067 from jacksontj/2015.8 
Fix infinite recursion in state compiler for prereq of SLSs
 2015-11-30 13:27:09 -07:00
Mike Place
2477ff2eab Add __init__ and pydsl test 2015-11-25 10:50:30 -07:00
Mike Place
063f075a99 Add integration renderer tests to the suite 2015-11-25 10:14:46 -07:00
Colton Myers
28b40de8da Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/__init__.py
    salt/client/ssh/ssh_py_shim.py
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/vmware.py
    salt/grains/philips_hue.py
    salt/modules/boto_ec2.py
    salt/modules/boto_route53.py
    salt/modules/dracr.py
    salt/modules/philips_hue.py
    salt/proxy/philips_hue.py
    salt/states/virtualenv_mod.py
 2015-11-24 16:07:31 -07:00
Mike Place
81bf332be4 Migrate pydsl tests to integration test suite 
This marks the beginning of a migration of the pydsl renderer tests
to the integration test suite and away from the unit test suite.

The unit test approach is becoming too difficult to maintain due to its complex approach to trying to internally manage a highstate run instead of calling into the salt state system to fully manage it.
 2015-11-24 15:46:14 -07:00
Weilu Jia
596843e8d6 Add test case for sls with only import 
Tests https://github.com/saltstack/salt/issues/10852
 2015-11-23 18:27:56 -08:00
Weilu Jia
64e439cda2 Add test for infinite recursion with sls prerequisites 2015-11-23 09:12:06 -08:00
Christophe Drevet-Droguet
89e7578d21 loader test for external grains deep merge (non-functional) 
This test is disabled until we have a way to reload the minion, or
just the custom grains, with the grains_deep_merge option set.
 2015-11-20 08:44:29 +01:00
Mike Place
714ef8ff27 Merge pull request #29057 from lyft/file-manage-local-source-list 
Add local file support for file.managed source list
 2015-11-19 14:57:34 -07:00
justinta89
64a62662ef Added sys import 2015-11-19 14:42:15 -07:00
Justin Findlay
401e4bfd33 file state: integration test difflib version check 2015-11-19 14:10:29 -07:00
justinta89
f947e1e549 Adjusted the expected output to match the actual results 2015-11-19 11:32:18 -07:00
Paul Fisher
d175061c5d Add tests for file.source_list with local files 2015-11-18 15:55:44 -08:00
Christophe Drevet-Droguet
f13e9435b1 loader test for custom grains 2015-11-18 22:08:24 +01:00
Mike Place
27b917b623 Adjust tests for new loader spec 2015-11-16 12:23:05 -07:00
Colton Myers
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
 2015-11-13 15:18:45 -07:00
Mike Place
785bf94f55 Add transport setting to shell test 2015-11-12 14:32:39 -07:00
Mike Place
8d3244166b Cast to dict to fix wheel tests in tcp 2015-11-12 12:21:52 -07:00
Mike Place
9b18f372e6 Normalize IPC check among transports 2015-11-11 16:26:32 -07:00
Mike Place
26fd2bc89e Merge pull request #28215 from s0undt3ch/features/signal-handling 
Proper signal handling
 2015-11-09 12:11:15 -07:00
rallytime
cded9ac01d Merge branch '2015.8' into 'develop' 
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
 2015-11-06 09:34:31 -07:00
Pedro Algarvio
058cd00aea Name some more runtests daemon processes 2015-11-06 13:15:12 +00:00
Pedro Algarvio
9dc5533fae Name the test daemon processes for ps output 2015-11-06 13:15:12 +00:00
rallytime
eec9d69387 Merge branch '2015.5' into '2015.8' 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/file.py
	tests/integration/__init__.py
 2015-11-04 15:52:59 -07:00
Mike Place
bdd5274c55 Merge pull request #28505 from plastikos/improvement-minio_process_grains 
Add grains/minion_process.py - grains describing the minion process
 2015-11-04 07:40:05 -07:00
Thayne Harbaugh
3bedbb713b Use "test.versions" instead of "-g" (pid in grains changes). 
integration.shell.call.test_issue_15074_output_file_append test just needs any
output that is repeatable.  Previously it used the grains output ("-g"
argument).  Unfortunately grains now includes the PID which changes for each
invocation of "salt-call" and is therefore not predictably comparable.  Use
"test.versions" that should have constant output across multiple invocations.
 2015-11-03 14:10:37 -07:00
Thayne Harbaugh
ab09d08c99 Expand test integration.modules.grains to check for new minion process grains. 2015-11-03 00:14:32 -07:00
Colton Myers
32969b2408 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    salt/cloud/clouds/digital_ocean.py
    salt/cloud/clouds/linode.py
    salt/loader.py
    salt/modules/blockdev.py
    salt/modules/boto_route53.py
    salt/modules/boto_vpc.py
    salt/modules/bsd_shadow.py
    salt/modules/file.py
    salt/modules/rabbitmq.py
    salt/modules/schedule.py
    salt/modules/win_network.py
    salt/runners/state.py
    salt/spm/__init__.py
    tests/unit/modules/blockdev_test.py
 2015-11-02 18:19:01 -07:00
twangboy
cf1e059be5 Fixed windows tests 2015-11-02 16:16:22 -07:00
Colton Myers
3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
 2015-10-30 16:05:26 -06:00
Kent Shultz
73236b4ea8 commit 7b262f8 missed one fix 2015-10-28 17:18:01 -07:00
Mike Place
e9bdd746ab Merge pull request #28349 from s0undt3ch/features/signal-handling-from-scratch 
Proper signal handling - [Different approach]
 2015-10-28 11:16:49 -06:00
Pedro Algarvio
7d9e310bc3 Shut up pylint 2015-10-28 14:24:44 +00:00
Pedro Algarvio
7b262f8bf7 Import 'integrations' not 'tests.integrations' 2015-10-28 14:24:44 +00:00
Dmitry Kuzmenko
435e8fc4d9 Fix tests: add module function docstring 2015-10-26 16:07:52 +03:00
Dmitry Kuzmenko
df2b40e854 Fixed @depends integration test 2015-10-26 16:07:52 +03:00
Erik Johnson
0d6a4ac115 Remove non-functional test 
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
 2015-10-24 17:39:16 -05:00
Erik Johnson
86f00e71bf Remove non-functional test 
This test was written using an incorrect assumption that the
pillar_roots key created during git_pillar execution lives any longer
than the run that compiles the git_pillar data for a given git_pillar.
 2015-10-24 17:36:33 -05:00
Thayne Harbaugh
a584ba567b Test for loader collisions between modules and packages 
What gets loaded from the following layout?:

  foo.py:bar()
  foo/__init__.py:bar()

This used to raise an exception (up until yesterday).  For now this ensures
that foo/__init__.py:bar() has higher priority than foo.py:bar() when
foo.bar() is referenced.
 2015-10-22 13:49:09 -06:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
justinta89
d88ac2589f Changed grain to look at osmajorrelease instead of osrelease 2015-10-14 10:42:55 -06:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
Mike Place
ba2a39d4b7 Merge pull request #27748 from multani/fix-8646 
Fix #8646
 2015-10-12 09:55:57 -06:00
Colton Myers
35425b14ad Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/man/salt-api.1
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt-key.1
    doc/man/salt-master.1
    doc/man/salt-minion.1
    doc/man/salt-run.1
    doc/man/salt-ssh.1
    doc/man/salt-syndic.1
    doc/man/salt-unity.1
    doc/man/salt.1
    doc/man/salt.7
    salt/modules/pip.py
    salt/states/user.py
 2015-10-07 12:06:12 -06:00
Jonathan Ballet
6d95cbc998 Fix lint errors 2015-10-07 17:49:07 +02:00
Jonathan Ballet
4ff9f4be2a Fix file.directory with clean=true and require_in with states ID 
In order to know which files need to be cleaned up, a file.directory state
looks at its requirements.
Previously, it only looked at the name attribute of the required state and
supposed it was the name of the file to keep within this directory. It's
not completely right, as a requirement can also be made against a state ID,
in which case the 'name' attribute of the required state then have to be
used.

Fix #8646
 2015-10-07 14:53:04 +02:00
Jonathan Ballet
0d391275de Test cases to demonstrate bug #8646 2015-10-07 12:06:35 +02:00
Oleg Gashev
2a88028595 Added skip test_ext_pillar_env_mapping if git module does not exist. 
If module named git does not exist, test test_ext_pillar_env_mapping
fail:

======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
    import git
ImportError: No module named git

Added skip test_ext_pillar_env_mapping test.
 2015-10-05 14:47:25 -06:00
Oleg Gashev
4e2d21ac68 Added skip test_ext_pillar_env_mapping if git module does not exist. 
If module named git does not exist, test test_ext_pillar_env_mapping
fail:

======================================================================
ERROR: test_ext_pillar_env_mapping
(integration.modules.pillar.PillarModuleTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/opt/git/salt/tests/integration/modules/pillar.py", line 120, in
test_ext_pillar_env_mapping
    import git
ImportError: No module named git

Added skip test_ext_pillar_env_mapping test.
 2015-10-05 12:49:06 +00:00
Colton Myers
41cad702e3 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/rest_service.py
    salt/states/dockerng.py
    salt/utils/cloud.py
 2015-09-29 18:13:33 -06:00
Erik Johnson
519bdd6438 Fix integration tests for worktree addition in git >= 2.6 
The output from 'git worktree add' changed slightly in 2.6.
 2015-09-29 12:01:45 -05:00
Matti Niemenmaa
8eb5036f1f states.file: allow prepending to non-existent file (#27401) 
Remove the redundant file.touch invocation also from file.append, to
simplify the flow.
 2015-09-27 09:06:51 +03:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
rallytime
a0de117a0f Merge branch '2015.8' into develop 
Conflicts:
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/config/__init__.py
 2015-09-11 09:33:21 -06:00
Seth House
e47fe835c9 Remove mocks from rest_cherrypy integration tests 
These mocks predated the inclusion of salt-api into Salt core. They are
now no longer needed and counter-productive.
 2015-09-09 10:39:35 -06:00
Seth House
6d22514934 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-09 10:39:34 -06:00
Nicole Thomas
eddb532713 Merge pull request #26915 from rallytime/joyent-tests 
Update Joyent Cloud Tests
 2015-09-09 09:04:50 -06:00
Seth House
d68aefcfde Remove mocks from rest_cherrypy integration tests 
These mocks predated the inclusion of salt-api into Salt core. They are
now no longer needed and counter-productive.
 2015-09-08 15:40:06 -06:00
Seth House
2aa3da8911 Rename the rest_cherrypy tests to conform to our convention 
Previously they conformed to the default unittest2 convention.
 2015-09-08 15:40:06 -06:00
Pedro Algarvio
10a9189d83 Merge remote-tracking branch 'upstream/2015.8' into hotfix/merge-forward-develop 2015-09-06 12:42:58 +01:00
rallytime
d4ad42d697 Update Joyent Cloud Tests 2015-09-04 12:23:05 -06:00
Mike Place
1d5fd71fa3 Merge pull request #26880 from s0undt3ch/hotfix/26848-event-backwards-compat 
Restore backwards compatibility to `salt.utils.event`
 2015-09-03 17:04:45 -06:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
justinta89
1aadbdfc6b Fixed lint error 2015-09-03 13:40:43 -06:00
justinta89
06bea434e1 fixed an unboundlocalerror 2015-09-03 13:16:36 -06:00
justinta89
8c42178e1a Fixed a lint error 2015-09-03 10:21:41 -06:00
justinta89
5a33017791 Gets the azure version correctly on python-azure 1.0.0 2015-09-03 10:00:36 -06:00
Pedro Algarvio
00b9cc9a83 Only place salt's code root dir in sys.path, not anything above that 2015-09-03 10:49:01 +01:00
Erik Johnson
22341b3139 Add debug logging 
This is a massive test function with steps dependent on each other.
These log messages make it easier to look through the log file to
troubleshoot failures.
 2015-09-02 20:58:06 -05:00
Erik Johnson
37c8852584 Update git.config_set tests to use new state name 2015-09-02 20:58:06 -05:00
Colton Myers
278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/gce.py
 2015-09-01 15:15:13 -06:00
Colton Myers
3b696d97b3 Fix lint 2015-08-28 17:39:41 -06:00
Colton Myers
1bbe45538e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/__init__.py
    salt/modules/smartos_vmadm.py
    salt/utils/s3.py
    setup.py
 2015-08-28 16:44:08 -06:00
Colton Myers
b509cdfa4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/linode.py
    salt/grains/ssds.py
    salt/modules/git.py
    salt/modules/pip.py
    tests/integration/cloud/providers/gogrid.py
    tests/integration/cloud/providers/linode.py
    tests/integration/cloud/providers/msazure.py
    tests/integration/cloud/providers/rackspace.py
    tests/unit/modules/pip_test.py
 2015-08-28 16:33:54 -06:00
Colton Myers
964a47c643 Fix tests 2015-08-28 13:50:31 -06:00
Colton Myers
2db2451cdf Merge pull request #26607 from cachedout/minion_opts_dep 
Minion opts generation in yaml test
 2015-08-28 10:00:07 -06:00
Mike Place
d3abc786cb Lint 2015-08-27 13:46:29 -06:00
Erik Johnson
b401328558 tests/integration/states/ssh.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
8053d1f952 tests/integration/states/mysql.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
e2342aadb7 tests/integration/modules/state.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
93e2f4eff7 tests/integration/modules/mysql.py: remove raw string formatting 2015-08-26 23:26:08 -05:00
Erik Johnson
d6b4e8d033 tests/integration/__init__.py: remove raw string formatting 2015-08-26 23:26:07 -05:00
Colton Myers
40718af1d5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/modules/win_service.py
    tests/integration/cloud/providers/digital_ocean.py
 2015-08-26 14:29:57 -06:00
Colton Myers
3d6f7b0e6a Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/utils/aws.py
 2015-08-25 13:57:49 -06:00
rallytime
c0d83d558d Don't use id as variable 2015-08-25 11:03:30 -06:00
rallytime
2b4bc1679d Keep ec2 instance creation test the same - it works better for the ec2 output 2015-08-25 11:01:02 -06:00
rallytime
b5b58eb31f Skip digital ocean tests since we can't use API v1 with v2 tests 2015-08-25 10:44:28 -06:00
rallytime
9ae1539c62 Update cloud tests to be more efficient and accurate 2015-08-25 09:49:32 -06:00
rallytime
e14931ff2d Also add -Z to script args for cloud tests 2015-08-24 16:11:01 -06:00
rallytime
9ae27193d8 Also add -Z to script args for cloud tests 2015-08-24 16:02:26 -06:00
Nicole Thomas
2964700609 Merge pull request #26619 from rallytime/cloud-test-fixes 
Apply cloud test fixes from 2015.5 to 2015.8
 2015-08-24 15:49:33 -06:00
David Boucha
5522d87a11 Merge pull request #26603 from terminalmage/issue13550 
Fixes for git.latest, git module integration tests, etc.
 2015-08-24 16:47:16 -05:00
Nicole Thomas
ed166ebd4f Merge pull request #26618 from rallytime/pip-undate-cloud-tests 
Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests
 2015-08-24 15:15:24 -06:00