valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,260 Commits 24 Branches 182 Tags 341 MiB
8d3957f250
Commit Graph

2512 Commits

Author SHA1 Message Date
rallytime
8d3957f250 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
 2016-10-28 11:58:41 -06:00
rallytime
e4dc059959 Update Carbon versionadded tags to 2016.11.0 in tests/* 2016-10-27 10:04:13 -06:00
rallytime
a9da340759 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-25 10:40:15 -06:00
Pablo Suárez Hernández
32f44b43ee Fix Zypper module and tests for Carbon 2016-10-25 11:08:00 +01:00
rallytime
027e2212c9 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/status.py
  - salt/modules/win_status.py
  - salt/modules/zypper.py
  - salt/utils/network.py
  - tests/unit/transport/zeromq_test.py
 2016-10-24 09:29:53 -06:00
Mike Place
c5d81a8ade Merge pull request #37158 from jfindlay/mac_skip_uptime 
add mock for `status.uptime` unit test
 2016-10-24 12:13:53 +09:00
rallytime
8fff95b3b4 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/gpg.py
  - salt/modules/zypper.py
 2016-10-21 16:09:17 -06:00
Justin Findlay
094eac06eb modules.status.uptime unit test: mock on linux 2016-10-21 15:50:42 -06:00
Pablo Suárez Hernández
01b0a6917c Minor pylint fixes 2016-10-20 11:33:11 +01:00
Pablo Suárez Hernández
7dbb0bd252 Unit tests fixes 2016-10-20 10:59:48 +01:00
Pablo Suárez Hernández
a092a974da Refactor: Cleanup and pylint fixes 2016-10-19 14:57:03 +01:00
Pablo Suárez Hernández
1331ae5c72 Unit tests for zypper upgrade and dist-upgrade 2016-10-19 13:21:55 +01:00
Mike Place
d97f649557 Merge pull request #37066 from Unity-Technologies/feature/powercfg_schemes 
Allowed for specifying the scheme for powercfg
 2016-10-19 11:39:02 +09:00
rallytime
bab91dbe91 Don't compare a (0,) object to None in skipIf 
We should check to make sure the version is > 0 to run the test
 2016-10-18 10:22:31 -06:00
rallytime
ec7626d6ea Revert "Spelling fix: the module is named dockerng, not just docker." 
This reverts commit 94f72813c27299994e6522480bab760ca9f22878.
 2016-10-18 09:49:07 -06:00
rallytime
fe2a6dbc7f Spelling fix: the module is named dockerng, not just docker. 2016-10-18 09:49:07 -06:00
rallytime
a45b75cd9c Pylint fix: remove extra comma 2016-10-18 09:49:07 -06:00
rallytime
beed75ef39 Just use nested with statements so the test will work on all Pythons 2016-10-18 09:49:07 -06:00
rallytime
5e2f20ad37 Maintain two different tests for Py2 vs 3 in dockerng_test file 2016-10-18 09:49:07 -06:00
Mike Place
4b6838baf9 Fix Docker test for Py3 
Move to Py3-compat nested context manager approach.

Fix bug in thin generation where non-abs paths were not avoided.
 2016-10-18 09:49:07 -06:00
Daniel Hobley
a133a2466e Allowed for specifying the scheme for powercfg 2016-10-18 09:49:07 +02:00
Mike Place
202414c88b Merge pull request #37024 from gtmanfred/hashutil 
add the ability to verify github webhook hmac signatures
 2016-10-18 10:55:28 +09:00
twangboy
b3b688e298 Fix tests 2016-10-17 13:31:55 -06:00
rallytime
6d0cedcadd Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-17 09:06:12 -06:00
Daniel Wallace
a7f8ca0a84 add the ability to verify github webhook hmac signatures 2016-10-17 07:57:47 -05:00
rallytime
112dc5d9c1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cli/salt.py
  - salt/client/__init__.py
  - salt/modules/archive.py
  - tests/integration/modules/pkg.py
 2016-10-14 12:03:08 -06:00
Zhi Han
3ddddd82b7 Fix mac_package wildcard install error on mac 2016-10-13 21:29:40 -04:00
Amir Pakdel
d7cfcf4135 Whitespace bugfix in linux acl.getfacl (#36827) 
* Whitespace bugfix in linux acl.getfacl

It is a trivial fix

* Whitespace bugfix in linux acl.setfacl

Also updated tests

* Linting
 2016-10-13 15:14:09 -06:00
Thomas S Hatch
6b782c15e1 Merge pull request #36755 from terminalmage/issue36671 
systemd.py: check retcode for service availability in systemd >= 231
 2016-10-13 13:41:50 -06:00
Nicole Thomas
a2206e805f Merge pull request #36938 from wanparo/develop 
acl.delfacl: fix position of -X option to setfacl
 2016-10-13 08:53:34 -06:00
rallytime
29d299d23b Adjust linux_acl unit test argument ordering 2016-10-12 10:57:42 -06:00
rallytime
55fe0aa2e4 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-11 17:22:12 -06:00
rallytime
b196c9336a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-11 13:54:09 -06:00
rallytime
c09b9d6e6a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-10 10:21:04 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-10 10:18:02 -06:00
Erik Johnson
7c78d6f419 Add unit tests for systemd scope usage 2016-10-07 17:35:09 -05:00
rallytime
2e34277b65 Add '--no-psqlrc' option to new-to-carbon postgres unit test 2016-10-07 16:10:57 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
Mike Place
1284de27fc Merge pull request #36789 from maximeguillet/fix-psqlrc-pg9.6 
Fix behavior of psql -c option with postgresql 9.6
 2016-10-06 20:24:51 +09:00
Maxime Guillet
b59c23bef1 Fix one remaining postgresql tests linked to #36787. 2016-10-05 17:05:10 +02:00
Mike Place
53f1523cb8 Merge pull request #36790 from cachedout/pr-36727 
Merge forward carbon to develop
 2016-10-05 23:57:23 +09:00
Maxime Guillet
8b92ae2061 Fix postgresql tests using position in the argument list of psql. 
Some tests use position number in the argument list of psql command
to check their results. As #36787 add one element, next position
in the list must be used.
 2016-10-05 16:08:42 +02:00
Maxime Guillet
21f2a17a07 Fix postgresql tests by adding --no-psqlrc option introduced by #36787. 2016-10-05 14:43:02 +02:00
Erik Johnson
d916c2b49c Handle cases where retcode/output feature is backported 
This will handle the case of RHEL 7.3, which maintains an older version
of systemd with the retcode/output changes from "systemctl status" in
systemd 231 backported.
 2016-10-04 09:55:56 -05:00
Erik Johnson
b3364646ad Update systemd module unit tests 
The _systemctl_status() function has changed its return data, this
commit updates the affected tests to reflect this.
 2016-10-03 22:51:43 -05:00
Mike Place
d2ab4b11b5 Merge pull request #36689 from msiebeneicher/develop 
Feature :: provide state.show_state_usage call
 2016-10-03 20:53:01 +09:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-30 16:13:08 -06:00
rallytime
5d7b4e4511 Merge branch 'carbon' into 'develop' 
Conflicts:
  - conf/master
  - doc/ref/configuration/logging/index.rst
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
  - salt/modules/gpg.py
 2016-09-30 16:10:33 -06:00
Sergey Kizunov
7337ddb1a4 Updated rabbitmq module unit test 
Updated to track changes to the rabbitmq module for the Windows
port.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-29 11:15:02 -05:00
msiebeneicher
8c8ac46b74 added unit tests for state.show_state_usage functionality 2016-09-29 18:06:45 +02:00