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
71,473 Commits 24 Branches 182 Tags 341 MiB
653d669e66
Commit Graph

4382 Commits

Author SHA1 Message Date
rallytime
7cc438754d Use assertCountEqual in Python 3 to handle unsorted list returns 
Fixes the cassandra execution module unit tests
 2016-07-21 14:33:02 -06:00
rallytime
1a9d6eee15 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/state.py
  - tests/unit/grains/core_test.py
 2016-07-21 12:06:25 -06:00
rallytime
15b4f5a8b3 Skip GCE unit tests - causes test suite to hang 2016-07-21 10:53:00 -06:00
Mike Place
62ef8fdb35 Merge pull request #34670 from isbm/isbm-osmajorrelease-grain-suse 
Add "osmajorrelease" grain (2016.3)
 2016-07-20 08:39:38 -06:00
Mike Place
aff29906fc Merge pull request #34671 from isbm/isbm-osmajorrelease-grain-suse-devel 
Add "osmajorrelease" grain
 2016-07-20 08:35:34 -06:00
Mike Place
b986c35a88 Merge pull request #34794 from rallytime/reneable-pam-test 
Renable the pam execution module unit test
 2016-07-20 08:05:50 -06:00
Mike Place
b7fe952427 Remove test for file dir behavior 
Refs #34809
 2016-07-20 08:04:00 -06:00
rallytime
d68b60bff8 Renable the pam execution module unit test 
The logic wasn't correct on the skipIF. We want these test to run
when sys.platform.startswith('OpenBSD') is False.
 2016-07-19 16:15:12 -06:00
Mike Place
8b3b2cfe69 Merge pull request #34268 from DSRCompany/features/23194_publisher_acl_globing 
Regex support in publisher ACL rules.
 2016-07-19 15:37:06 -06:00
rallytime
7b0ad25b09 Remove iteritems() references from unit/transport/*.py files 2016-07-19 10:22:33 -06:00
rallytime
0ad8183973 Remove iteritems() references from unit/modules/*.py 2016-07-19 10:18:26 -06:00
Bo Maryniuk
038d2c3087 Fix group-add tests for SUSE 2016-07-19 18:01:37 +02:00
Bo Maryniuk
110a422d5a Keep osmajorrelease as a string type for 2016.3 release 2016-07-19 17:52:08 +02:00
rallytime
0baf92a972 Remove tests that were deleted in develop already 2016-07-18 11:14:21 -06:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
 2016-07-18 10:34:03 -06:00
Dmitry Kuzmenko
27017e34ce Regex support in publisher ACL rules. 
Users in publisher ACL and users and functions in the publisher ACL
blacklist now have matched in the following order:
1. Equality
2. Glob
3. Regex

Users in publisher ACL still not supported in systems without pwd python
module (Windows, any else?)
 2016-07-18 19:15:28 +03:00
Bo Maryniuk
3cb6940904 Bugfix: access 'osmajorrelease' as an integer value 2016-07-18 17:14:57 +02:00
Mike Place
4625ee65b8 Remove unnedeed config test 
Refs #34607
 2016-07-18 09:12:18 -06:00
Nicole Thomas
2a3df50223 Merge pull request #34724 from rallytime/test-fix-34270 
Update mock value to match change in #34270.
 2016-07-16 14:06:04 -06:00
rallytime
f667b936e5 Update mock value to match change in #34270. 
Fixes the failing test in #34270
 2016-07-16 14:03:37 -06:00
Mike Place
1b3742c41b Merge pull request #34599 from meaksh/salt-snapper-module 
Snapper execution module and state for Salt
 2016-07-16 13:43:06 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
Mike Place
e918aba3c3 Merge pull request #34704 from babilen/influxdb-current 
Influxdb current
 2016-07-16 12:39:22 -06:00
Wolodja Wentland
87b54170aa Rename InfluxDB states and modules for 0.8 
InfluxDB versions newer than 0.8 introduced significant changes in
database concepts, user administration and Python API.

We therefore decided to rename the old InfluxDB states to 'influxdb08*'
and to reserve the 'influxdb' name for InfluxDB 0.9+ compatible states
and modules.
 2016-07-16 09:46:44 +02:00
Mike Place
b11fd8ef6a Merge pull request #34484 from dmacvicar/docker_images 
[WIP] Creating Docker images with pure Salt and running Salt commands inside containers
 2016-07-15 16:17:59 -06:00
Bo Maryniuk
e5c3195fa3 Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:14:27 +02:00
Bo Maryniuk
96021e257c Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:13:58 +02:00
rallytime
bb2c43b52a Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-07-14 14:10:10 -06:00
Bo Maryniuk
2040c7caa5 Add unit test for osmajorrelease grain 2016-07-14 18:08:15 +02:00
Bo Maryniuk
208fd33b48 Add unit test for osmajorrelease grain 2016-07-14 18:05:12 +02:00
Mike Place
eadae09e0a Merge pull request #34563 from rallytime/py3-state-unit-tests 
Py3 fixes for running unit tests in the unit/states/ directory.
 2016-07-14 08:28:49 -06:00
Anthony Shaw
7786c0020c Libcloud DNS module fix (#34628) 
* add test module

* add broken test

* fix typo in config dictionary

* remove call to unused function, add called_with assertion
 2016-07-13 11:47:20 -04:00
Justin Anderson
445f8afc69 Fixes failing test on Suse Leap (#34621) 2016-07-12 18:48:06 -04:00
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
 2016-07-12 16:13:56 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
 2016-07-12 14:29:35 -06:00
Nicole Thomas
b90ae407f9 Add support for edge case when Cmd and Entrypoint can't be blanked (#34593) 2016-07-12 15:18:53 -04:00
Justin Anderson
7dd8035c62 Gate docker unit test to check for docker (#34591) 
* Gate docker unit test to check for docker

* Change skipIf to check if docker-py is installed, not version check
 2016-07-12 13:33:31 -04:00
Pablo Suárez Hernández
c00991bc1e Fix for pylint: W1699 2016-07-12 15:38:28 +01:00
Pablo Suárez Hernández
5213ddeab9 Fix in inline comments 2016-07-12 15:10:25 +01:00
Duncan Mac-Vicar P
b60f76b836 pylint: W1699(incompatible-py3-code) 2016-07-12 15:44:01 +02:00
Pablo Suárez Hernández
867bfbf353 Variable renaming. Pylint fixes 2016-07-12 14:03:52 +01:00
Duncan Mac-Vicar P
cfdb1c3928 typo 2016-07-12 14:38:22 +02:00
Duncan Mac-Vicar P
1f77336a1d test that fix /tmp is not used 2016-07-12 14:37:47 +02:00
Pablo Suárez Hernández
5c06e91417 pylint: some fixes 2016-07-12 12:24:04 +01:00
Pablo Suárez Hernández
39e8ff0f25 pylint fixes 2016-07-12 11:03:09 +01:00
Pablo Suárez Hernández
0a9dbfc33a unit test for snapper.diff with binary file 2016-07-12 09:02:31 +01:00
rallytime
9f5e275f2e When writing strings to tmp files, use bytes for Python 3 2016-07-11 16:07:35 -06:00
rallytime
640d8bb5b2 Pylint fixes 2016-07-11 14:26:06 -06:00
rallytime
de93203bf5 Remove object.iteritems() call from boto_elasticsearch_domain_test 
Also, clean up imports in that file and remove stray ` character from
boto_apigateway state from previous commit.
 2016-07-11 14:26:06 -06:00
rallytime
2a5dab3c56 Use six.iteritems(object) in boto_s3_bucket module and boto_s3_bucket_test 2016-07-11 14:26:06 -06:00