valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,901 Commits 24 Branches 182 Tags 341 MiB
ea9e6dfd73
Commit Graph

6256 Commits

Author SHA1 Message Date
Daniel Wallace
ea9e6dfd73 Merge branch 'develop' into modularise-tokens 2017-08-22 08:49:55 -06:00
Mike Place
b071384611 Merge pull request #42977 from redmatter/fix-broken-docker-network-create 
Remove check_duplicates from create_network call
 2017-08-21 15:59:50 -06:00
Nicole Thomas
9ac043d997 Merge branch 'develop' into fix-iptables-negation 2017-08-18 16:52:29 -04:00
rallytime
6ca3607770 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/modules/win_pkg.py
  - salt/utils/versions.py
 2017-08-18 09:28:26 -04:00
rallytime
93c11d827a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/minion.py
 2017-08-17 09:30:50 -04:00
rallytime
8a0f948e4a Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/utils/versions.py
  - tests/unit/modules/test_boto_elb.py
  - tests/unit/modules/test_boto_secgroup.py
  - tests/unit/states/test_boto_vpc.py
 2017-08-17 09:10:31 -04:00
Tarjei Husøy
6f19fc023c Fix broken negation in iptables 
Introduced in 7c6ff77c and released with 2017.7.
 2017-08-16 10:30:55 -07:00
Andrew Bulford
d3f792d47d Remove check_duplicates from create_network call 
The create_network function in dockermod.py doesn't take a
check_duplicates argument so passing it here causes a failure.

Fixes #42976
 2017-08-16 14:05:31 +01:00
twangboy
e9febe4893 Fix unit.test_fileclient 
Use os.sep instead of hard-coded, unix-style paths
 2017-08-15 16:34:03 -06:00
Mike Place
40c4323593 Merge branch 'develop' into modularise-tokens 2017-08-15 15:48:25 -06:00
Nicole Thomas
abac36d907 Merge pull request #42450 from pwdng/ldap_fix 
Use OrderedSet instead of set to allow handling of OpenLDAP X-ORDERED…
 2017-08-15 17:30:35 -04:00
Nicole Thomas
275122d04e Merge pull request #42834 from terminalmage/salt.utils.versions 
Move 4 functions from salt.utils to salt.utils.versions
 2017-08-15 17:28:24 -04:00
Mike Place
4f406602cf Merge branch 'develop' into ldap_fix 2017-08-15 12:36:47 -06:00
rallytime
c6b9ca4b9e Lint fix: add missing space 2017-08-15 14:26:44 -04:00
rallytime
5597b1a30e Skip 2 failing tests in Python 3 due to upstream bugs 2017-08-15 14:26:44 -04:00
rallytime
a0b19bdc27 Update account id value in boto_secgroup module unit test 
This value was updated in moto 1.0.0 with the following commit:

5f3fbff627
 2017-08-15 14:23:00 -04:00
rallytime
60b406e088 @mock_elb needs to be changed to @mock_elb_deprecated as well 2017-08-15 14:23:00 -04:00
rallytime
6ae1111295 Replace @mock_ec2 calls with @mock_ec2_deprecated calls 
moto versions >= 1.0.0 have changed the way the mocked connections through
boto are handled with the @mock_ec2 decorator. They use the boto3 connection
method. However, since we are still using boto in many places, we need to use
the new @mock_ec2_deprecated decorator instead to handle the boto connection
functions for the unit tests.

Versions of moto < 1.0.0 are not Python 3 compatible, so salt-jenkins should
be installing newer versions of moto for those tests. Unfortunately, we cannot
install an older version of moto for Python2 that use the original @mock_ec2 call
and also import the @mock_ec2_deprecated function for newer versions of moto
simultaneously as the @mock_ec2_deprecated function doesn't exist in older
versions of moto.
 2017-08-15 14:22:59 -04:00
Erik Johnson
2b76029ded Move 4 functions from salt.utils to salt.utils.versions 
This moves the following functions from salt.utils to salt.utils.versions:

- warn_until
- kwargs_warn_until
- compare_versions (as salt.utils.versions.compare)
- version_cmp
 2017-08-15 12:53:57 -05:00
Nicole Thomas
47ff9d5627 Merge pull request #42812 from terminalmage/yaml-loader-tests 
Update custom YAML loader tests to properly test unicode literals
 2017-08-15 13:50:22 -04:00
Erik Johnson
9d8486a894 Add test for custom YAML loader with unicode literal strings 2017-08-15 11:06:20 -05:00
Erik Johnson
a0118bcece Remove bytestrings and use textwrap.dedent for readability 
PyYAML works with and without bytestrings on PY3, and Python 3 can read
all of the test data as regular strings, so bytestrings are unnecessary
here.

This also adds use of textwrap.dedent to make the YAML easier to read,
so it can be indented away from the far left side of the line.
 2017-08-15 11:05:48 -05:00
garethgreenaway
8b48341a36 Merge branch 'develop' into fixing_beacons 2017-08-15 09:00:09 -07:00
Mike Place
db32d81d8a Merge pull request #42917 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-14 21:53:18 -06:00
Nicole Thomas
4fcdab3ae9 Merge pull request #42657 from nhavens/2017.7 
back-port #42612 to 2017.7
 2017-08-14 15:42:25 -04:00
Gareth J. Greenaway
ed742bb506 Updating mock from salt.utils to salt.utils.files for fopen. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
bf1aefa47b Updating memusage, ps and diskusage beacons for python3 related failures. Updating respective tests as well. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
fe5dd1e7b9 Removing unused import from ps beacon. Fixing mock for sensehat test. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
9072edd8a1 Fixing mocking for ps beacon. Types for sensehat beacon. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
d8ac1f8cfb Updating unit and integration tests for beacons to reflect changes. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
ff6f42405f Fixing typo in service beacon. Removing unused import. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
4e1fea1433 Updating logging, shuffling some imports of salt.ext.six.moves around to fix linting. better way to determine the twilio library version. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
813445d1ed Updating with various requested changes 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
cca7c0d091 Removing the wrong import, re-adding Mock and removing the ones that are not used. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
71963cccce fixing more lint issues 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
1ec4ccba85 Renaming all tests to be consistent with naming. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
23d572199a Adding test_beacon for the beacon state module. Updating beacon state module documentation. Removing over aggressive code in the validate function for service beacon. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
474b6dbdf8 Updating various documentation and beacons. Adding unit tests for the beacon module. 2017-08-14 12:04:38 -07:00
Gareth J. Greenaway
7f89fa4886 Removing test_network_settings_match from tests. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
ee3befbed8 Updating documentation for wtmp, btmp, fixing service tests and updating various bits in the service beacon. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
6f9412b41c adding network_info, network_settings, and service tests. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
4f6c04cbbf Adding the tests 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
507071e9e6 Updating the salt_proxy beacon to use list based configuration and adding unit tests. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
a04b0fe3ee Updating network_info beacon for list based configuration. Adding unit tests for network_info beacon 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
8b507b1635 Updating twilio_txt_msg & memusage beacons to ensure list based configuration. Adding/Updating unit tests for both. Updating twilio related things to support newer version of twilio python library. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
7361672339 Updating the telegram_bot_msg beacon to use list based configuration rather that dictionary based configuration. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
dfc27c63fd Updating beacon.log to use list based configuration rather than dictionary. Adding the unit test for beacon.log. 2017-08-14 12:04:37 -07:00
Gareth J. Greenaway
b03f840aed Simplying the validate functions by converting from list to dict when looking for various items to be present. 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
2a02d1c324 Updating inotify beacon & inotify beacon test to use list based configuration rather than dictionary based configuration 2017-08-14 12:04:36 -07:00
Gareth J. Greenaway
8f0a34e035 Adding unit test for haproxy beacon. Updating haproxy beacon to use list based configuration instead of dictionary based configurations 2017-08-14 12:04:36 -07:00