Commit Graph

6305 Commits

Author SHA1 Message Date
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
Daniel Hobley
6ad5014968 Lint fixes 2016-01-29 15:29:06 +01:00
Daniel Hobley
a4f4e52687 Added xattr module and state for OS X
- Allows you to add and remove special attributes to/from files
2016-01-29 15:01:40 +01:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop'
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
2016-01-26 16:19:39 -07:00
Nicole Thomas
d6e2c7aa82 Merge pull request #30614 from techhat/depimg
WIP: Deprecate salt/modules/img.py
2016-01-26 15:03:11 -07:00
Joseph Hall
29df2124a2 Remove tests for img.py since we're deprecating it 2016-01-26 11:00:38 -07:00
Colton Myers
5bc11d7539 Merge pull request #30631 from rallytime/fix-7811
Refactor rabbitmq_cluster states to use test=true functionality correctly
2016-01-26 09:23:49 -07:00
Colton Myers
621d8785de Merge pull request #30579 from sjorge/module-localemod
Fix up salt.modules.locale(mod) for Solaris and some generic improvements
2016-01-25 17:21:42 -07:00
Colton Myers
64f17568a4 Merge pull request #30627 from sjmh/etcd_set_tree
Add etcd update function
2016-01-25 17:07:46 -07:00
rallytime
bf9ffded6d Refactor rabbitmq_cluster states to use test=true functionality correctly
Fixes #7811
2016-01-25 16:47:54 -07:00
Colton Myers
94bf7790cf Merge pull request #30567 from rallytime/fix-25363
Make sure rabbitmq_vhost states are using test=true properly.
2016-01-25 16:19:45 -07:00
Colton Myers
818ff2af78 Merge pull request #30381 from quantonganh/launchctl-yosemite
Launchctl yosemite
2016-01-25 16:08:25 -07:00
rallytime
1e8e86007c Refactor rabbitmq_policy states to use test=true functionality correctly
Fixes #25658
2016-01-25 15:21:19 -07:00
Steve Hajducko
a015473d4e Add etcd update function
Adds a update function that takes a dict and sets multiple etcd keys.
2016-01-25 14:13:33 -08:00
Nicole Thomas
653292ec88 Merge pull request #30555 from twangboy/mac_brew
renamed brew.py to mac_brew.py
2016-01-25 12:30:31 -07:00
Jorge Schrauwen
4d2fa2e2aa switch unit test to except CommandExecutionError 2016-01-25 19:30:09 +00:00
rallytime
3f8b905642 Fix test failures 2016-01-25 12:08:30 -07:00
Nicole Thomas
25f127c948 Merge pull request #30580 from sjorge/module-timezone
salt.modules.timezone improvements for Solaris-like OS's
2016-01-25 11:43:25 -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
Nicole Thomas
b8009d7320 Merge pull request #30552 from twangboy/mac_pkgutil
Renamed darwin_pkgutil.py to mac_pkgutil.py
2016-01-25 10:47:57 -07:00
Nicole Thomas
fb0054afb5 Merge pull request #30556 from twangboy/mac_sysctl
rename darwin_sysctl.py to mac_sysctl.py
2016-01-25 10:46:04 -07:00
Jorge Schrauwen
98664445c7 Swapping one unknow for debian failed, because debian use a different
function internally. Switched to RedHat for the test as it returns
LANG=XYZ
2016-01-25 17:38:51 +00:00
Jorge Schrauwen
e4c511de4a update tests, we have a correct return now 2016-01-25 17:30:23 +00:00
Jorge Schrauwen
745f203ea3 unit test, better to test with unknown os_family, we expect "" result without patching cmd.run 2016-01-23 22:56:00 +00:00
Jorge Schrauwen
d153f43771 unit test was filling in fake os_familiy, new code skips the expensive cmd_run unknown os_family 2016-01-23 22:53:07 +00:00
twangboy
cec969db15 Fixed more tests 2016-01-22 19:24:38 -07:00
twangboy
aa47a2908f Fixed more lint 2016-01-22 19:20:24 -07:00
twangboy
3fcf9b4ba8 Fixed some lint 2016-01-22 19:15:29 -07:00
twangboy
e09f43b11b even more lint 2016-01-22 19:09:08 -07:00
twangboy
fef54563b0 More lint 2016-01-22 19:04:03 -07:00
twangboy
306d13a7fa Fixed tests 2016-01-22 17:36:48 -07:00
twangboy
1c58318013 Fixed tests 2016-01-22 17:32:42 -07:00
twangboy
88841e604f Fixed some tests 2016-01-22 17:27:18 -07:00
twangboy
6eb250a807 Fixed some tests 2016-01-22 17:20:25 -07:00
Mike Place
f27b602a0f Fix bad mock in win_service_test 2016-01-22 13:37:32 -07:00
Mike Place
44dea20bf3 Merge pull request #30550 from cachedout/fix_30113
Fixup for Let test=True option work for http.query state #30113
2016-01-22 11:35:31 -07:00
Mike Place
427f6f7cad Fix failing unit test 2016-01-22 10:54:25 -07:00
Andrew Colin Kissa
82a966b1f4 Add postgres_initdb state module tests 2016-01-22 12:16:51 +02:00
Andrew Colin Kissa
f5aa107583 Add tests for data directory init and existance check 2016-01-22 12:15:45 +02: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
Mike Place
40ba550ffd Merge pull request #30511 from kraney/boto_s3_bucket
Boto s3 bucket state
2016-01-21 15:52:58 -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
f22f5ff851 Fix lint 2016-01-21 15:33:15 -07:00
Erik Johnson
ea0ca70187 Add git.list_worktrees unit test 2016-01-21 15:42:30 -06: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
Kris Raney
16e8b4f9e3 cut-and-paste error 2016-01-21 13:23:52 -06:00