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
71,412 Commits 24 Branches 182 Tags 341 MiB
c1ae2537f1
Commit Graph

7626 Commits

Author SHA1 Message Date
Collin Richards
72d47a67c0 Modify interface from utc boolean to utc_offset 
The system set/get date/time functions now have
a utc_offset instead of a utc boolean so the time
can be set based off of any timezone.
 2016-06-29 18:25:26 -05:00
Collin Richards
0866ee850e Remove _linux_set_datetime backend 
Instead only use the date program as the backend.  This is much more
portable.
 2016-06-29 18:24:50 -05:00
Collin Richards
69f8dd96ae Remove posix arguments 2016-06-29 18:24:49 -05:00
rallytime
3149da1bcc Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-29 16:16:46 -06:00
rallytime
e8b7c0654b Be more explicit with salt.utils imports and usage 2016-06-29 15:59:42 -06:00
Justin Anderson
1d24053e36 network.system sls file 2016-06-29 14:31:46 -06:00
Justin Anderson
4a9e6af542 network.routes sls file 2016-06-29 14:31:07 -06:00
Justin Anderson
76c90b2ef6 network.managed sls file 2016-06-29 14:30:23 -06:00
Erik Johnson
20ed2c6bcf Remove repr formatting flag in places where it is used solely for quoting (#34183) 
* salt/cloud/__init__.py: remove repr formatting

* salt/cloud/clouds/azurearm.py: remove repr formatting

* salt/cloud/clouds/ec2.py: remove repr formatting

* salt/cloud/clouds/profitbricks.py: remove repr formatting

* salt/loader.py: remove repr formatting

* salt/modules/win_file.py: remove repr formatting

* salt/modules/zypper.py: remove repr formatting

* salt/pillar/consul_pillar.py: remove repr formatting

* salt/renderers/pyobjects.py: remove repr formatting

* salt/returners/sentry_return.py: remove repr formatting

* salt/states/bower.py: remove repr formatting

* salt/states/cabal.py: remove repr formatting

* salt/states/cmd.py: remove repr formatting

* salt/states/composer.py: remove repr formatting

* salt/states/win_network.py: remove repr formatting

* salt/states/eselect.py: remove repr formatting

* salt/states/file.py: remove repr formatting

* salt/states/htpasswd.py: remove repr formatting

* salt/states/memcached.py: remove repr formatting

* salt/states/npm.py: remove repr formatting

* salt/states/pip_state.py: remove repr formatting

* salt/states/pkg.py: remove repr formatting

* salt/states/pkgrepo.py: remove repr formatting

* salt/states/supervisord.py: remove repr formatting

* salt/states/timezone.py: remove repr formatting

* salt/states/virtualenv_mod.py: remove repr formatting

* salt/states/dockerio.py: remove repr formatting

* salt/states/win_system.py: remove repr formatting

* salt/utils/nb_popen.py: remove repr formatting

* salt/utils/cloud.py: remove repr formatting

* Add pylint disable due to legit usage of repr flag

See https://github.com/saltstack/salt-pylint/pull/6

* Fix composer tests

These tests needed to be updated because quoting was changed in the
state module in 9dc9146. There was an unnecessary !r used for the
exception class there, which means that instead of the exception class
being passed through the formatter and coming out with the equivalent
value of err.__str__(), we get a repr'ed instance of the exception class
(i.e.  SaltException('',)) in the state output.

The unit test was asserting that we have that repr'ed instance of
SaltException in the output, a case of writing the test to confirm the
badly-conceived output in the state. This has also been corrected.

* salt/cloud/clouds/azurearm.py: lint fixes

* salt/modules/boto_s3_bucket.py: lint fixes

* salt/modules/minion.py: lint fixes

* salt/modules/reg.py: lint fixes

* salt/modules/testinframod.py: lint fixes

* salt/modules/win_iis.py: lint fixes

* salt/pillar/csvpillar.py: lint fixes

* salt/utils/win_functions.py: lint fixes

* salt/states/nxos.py: lint fixes

* salt/returners/mongo_future_return.py: lint fixes

* tests/integration/__init__.py: lint fixes

* tests/unit/context_test.py: lint fixes

* tests/integration/states/file.py: lint fixes

* tests/integration/utils/test_reactor.py: lint fixes

* tests/integration/utils/testprogram.py: lint fixes

* tests/unit/__init__.py: lint fixes

* tests/integration/shell/minion.py: lint fixes

* tests/unit/modules/boto_apigateway_test.py: lint fixes

* tests/unit/modules/boto_cognitoidentity_test.py: lint fixes

* tests/unit/modules/boto_elasticsearch_domain_test.py: lint fixes

* tests/unit/modules/k8s_test.py: lint fixes

* tests/unit/modules/reg_win_test.py: lint fixes

* tests/unit/states/boto_apigateway_test.py: lint fixes

* tests/unit/states/boto_cognitoidentity_test.py: lint fixes

* tests/unit/states/boto_elasticsearch_domain_test.py: lint fixes
 2016-06-29 16:30:18 -04:00
Justin Anderson
84a36369fa Added network state integration test 2016-06-29 14:28:36 -06:00
rallytime
cc83fa151a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/status.py
  - salt/utils/__init__.py
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_vpc_test.py
 2016-06-28 17:34:27 -06:00
rallytime
c87a108a12 Don't forget the pylint disables for range 2016-06-28 16:52:37 -06:00
rallytime
359e8ca2ce Pylint fixes 2016-06-28 16:04:47 -06:00
Nicole Thomas
94e094652c Back-port #34324 to 2015.8 (#34344) 
* Add test to match against custom grains

* Lint

* Forgot to add custom grain
 2016-06-28 16:35:32 -04:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-28 14:26:24 -06:00
Winston Liu
d4c1463cfa added an optional parameter into boto_sns absent state to remove all subscriptions tied to the topic being removed. 2016-06-28 13:16:53 -07:00
Erik Johnson
f6bd1ad47e Revert py3modernize lint changes (#34339) 
* salt/__init__.py: revert py3modernize lint changes

* salt/cloud/clouds/vmware.py: revert py3modernize lint changes

* salt/modules/jboss7_cli.py: revert py3modernize lint changes

* salt/payload.py: revert py3modernize lint changes

* salt/serializers/yamlex.py: revert py3modernize lint changes

* salt/states/win_servermanager.py: use absolute imports

* salt/utils/args.py: revert py3modernize lint changes

* salt/utils/decorators/__init__.py: use __name__ instead of func_name

__name__ is py3-compatible and also works on builtins in py2, which
func_name does not.

* salt/utils/compat.py: revert py3modernize lint changes

* salt/utils/__init__.py: revert py3modernize lint changes

* salt/version.py: revert py3modernize lint changes

* tests/salt-tcpdump.py: revert py3modernize lint changes
 2016-06-28 16:04:02 -04:00
Mike Place
80a659bb51 Merge pull request #34283 from sjorge/2016.3-mount-fstab 
2016.3 mount vfstab support
 2016-06-28 12:23:39 -07:00
Mike Place
4feea285d4 Merge pull request #34248 from anderbubble/bugfix/find-depth 
Correct handling of min/maxdepth during file.find (#34217)
 2016-06-28 12:19:18 -07:00
Mike Place
046bdaa9f2 Merge pull request #34306 from ghedo/iptables_flush_table 
Fix iptables.flush state: Do not force 'filter' table when flushing
 2016-06-28 12:03:14 -07:00
Mike Place
e81bd6ee94 Test custom grains matcher (#34324) 
* Add test to match against custom grains

* Lint

* Forgot to add custom grain
 2016-06-28 12:17:14 -04:00
Erik Johnson
b793426c23 Remove unnecessarily-disabled sanity check (#34325) 
This was commented out for reasons having nothing to do with anything
else going on in 0c069dd. Uncommenting this sanity check so that we are
notified if we need to update our targets in the future.
 2016-06-28 11:12:55 -04:00
Alessandro Ghedini
882c6c9c86 Do not force 'filter' table when flushing 
The "table" argument is already part of the function signature, this means
that flush() will always force the "filter" table even when the user sets
a different one.
 2016-06-28 15:40:50 +01:00
Ch3LL
693cc61aa4 add osmajorrelease to ubuntu and fix pylint 2016-06-27 16:32:21 -06:00
Ch3LL
2fc3e8a54b add osmajorrelease grain for raspbian 2016-06-27 14:45:09 -06:00
Mike Place
1e5da4ba8f Merge pull request #34286 from Ch3LL/add_key_module_test 
Add test for key module
 2016-06-27 10:09:13 -07:00
Jorge Schrauwen
b8c6948cd5 fixes broken rm_fstab test due to missing __grain__.kernel 2016-06-25 15:42:15 +02:00
Ch3LL
5f302d8205 Add test for key module 2016-06-24 16:24:21 -06:00
rallytime
c2b52ccf9c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/ipset.py
 2016-06-24 16:03:11 -06:00
Jorge Schrauwen
c3667203bf add test for vfstab 2016-06-24 23:33:39 +02:00
Jorge Schrauwen
80e9d1d278 set __grains__ for fstab unit test 2016-06-24 23:28:53 +02:00
rallytime
ae8ad9329c Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/renderers/gpg.py
  - tests/unit/renderers/gpg_test.py
 2016-06-24 14:45:37 -06:00
Jonathon Anderson
ed74415155 Addressed unit testing for salt.utils.find 
In addition to addressing test failures introduced by this
bugfix branch, I've also added additional tests for the
proper behavior of min/maxdepth.
 2016-06-24 14:06:17 -06:00
Mike Place
65c5675a3f Merge pull request #34257 from rallytime/fix-34037 
Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer
 2016-06-24 10:25:04 -07:00
rallytime
d7a5e9b10e Remove test that doesn't actually test anything 2016-06-24 09:10:13 -06:00
Jorge Schrauwen
a09055cba7 Fix for #14915 (#34254) 
* mount.swaps now works on solarish like systems

* mount.swapon / mount.swapoff supported on solarish platforms

* mount.active (and internal consumers) now work on all solarish platforms

* unit-tests - mount_tests should set kernel grain
 2016-06-24 10:32:48 -04:00
rallytime
07f5ebdf38 Pylint fix 2016-06-24 08:28:25 -06:00
rallytime
ea048fd9b6 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - tests/unit/grains/core_test.py
 2016-06-23 17:13:20 -06:00
Mike Place
e7c08bc620 Merge pull request #34167 from DSRCompany/issues/30762_ext_auth_acl 
External auth can return dynamically generated ACL from auth call.
 2016-06-23 14:26:44 -07:00
Mike Place
cb5399787c Merge pull request #34136 from meaksh/salt-suse-os-detection-2015.8 
Fixed behavior for SUSE OS grains in 2015.8
 2016-06-23 13:24:58 -07:00
Mike Place
3acda896f2 Merge pull request #34134 from meaksh/salt-suse-os-detection 
Fixed behavior for SUSE OS grains in 2016.3
 2016-06-23 13:24:51 -07:00
Mike Place
f65535a307 Merge pull request #34220 from LeadSift/develop 
Fixes #34181 no more newlines in long yaml encodes
 2016-06-23 10:51:48 -07:00
Justin Anderson
4fc44bd2f2 Updated winrepo_test (#34227) 
Due to changes made in https://github.com/saltstack/salt/pull/34004,
specifically the "Universal method for everywhere" addition, we
no longer needed to mock the return values as this gets the correct
path.
 2016-06-23 13:05:49 -04:00
rallytime
8cec6f3fb4 Fixup test failure 2016-06-23 09:38:49 -06:00
Hatem Nassrat
9f16d6019c Fixes #34181 no more newlines in long yaml encodes 2016-06-22 18:35:19 +00:00
rallytime
8479c45728 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-06-21 17:29:44 -06:00
rallytime
318c2ed6a1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/grains.py
  - tests/unit/modules/boto_vpc_test.py
 2016-06-21 16:03:31 -06:00
rallytime
8e36e90966 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
 2016-06-21 14:47:23 -06:00
Dmitry Kuzmenko
45a3601172 Minor lint fix. 2016-06-21 20:47:55 +03:00
Mike Place
3669048654 Merge pull request #34077 from rallytime/grains-tests 
Add some grains targeting tests
 2016-06-21 09:06:30 -07:00
Dmitry Kuzmenko
fca16a93fa External auth can return dynamically generated ACL from auth call. 2016-06-21 15:02:03 +03:00
Mike Place
8f714138eb Use .next() in contextdict test for py3 (#34106) 2016-06-20 19:32:34 -04:00
rallytime
b061b86946 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-20 17:22:07 -06:00
Nicole Thomas
39cd302686 Spelling fix (#34154) 2016-06-20 19:11:01 -04:00
Mike Place
2ecc4129b0 Automated test for sleeping minion (#34149) 
Closes #34147
 2016-06-20 19:07:55 -04:00
rallytime
2199bb8a78 Add integration tests for grains.append 2016-06-20 16:44:22 -06:00
Thomas S Hatch
3543b90f5c Merge pull request #34024 from richardscollin/system-date-module 
Add get/set datetime functionality - system module
 2016-06-20 13:38:17 -06:00
Thomas S Hatch
3dbf7119ce Merge pull request #34088 from Unity-Technologies/osx/mac_defaults_absent 
Osx/mac defaults absent
 2016-06-20 13:30:40 -06:00
Justin Anderson
b7ac6c735a Moved imports to top, out of _get_moto_version function 2016-06-20 13:20:43 -06:00
Collin Richards
b9b3d77430 Fix more pep8 issues 2016-06-20 12:05:05 -05:00
Justin Anderson
02f9ba99ba Updated version check. Moved check into it's own function 2016-06-20 10:33:13 -06:00
Justin Anderson
d445026c56 Updated test to work with new moto version. Changed strings to unicode 2016-06-20 09:26:39 -06:00
Pablo Suárez Hernández
97f1958863 some cleanup and renaming 2016-06-20 15:47:34 +01:00
Pablo Suárez Hernández
23ce0b431b some cleanup and renaming 2016-06-20 15:39:19 +01:00
Pablo Suárez Hernández
548971bdc9 Fix for SUSE OS grains in 2015.8 2016-06-20 13:13:00 +01:00
Pablo Suárez Hernández
44eda2ad9f Fix for openSUSE Tumbleweed 2016-06-20 12:04:10 +01:00
Pablo Suárez Hernández
0d4a710d86 fixes for fopen mock and some os_release_map for SLES11SP3 2016-06-20 11:56:06 +01:00
Pablo Suárez Hernández
d6410a03b8 unit tests for SUSE os grains detection 2016-06-20 11:22:01 +01:00
Nicole Thomas
3382bc5c28 Merge pull request #34076 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-06-17 15:13:30 -04:00
Henrik Holmboe
523b2acae9 return_valute -> return_value (#34091) 2016-06-17 13:02:07 -04:00
rallytime
0f92f3420d Change 'Suse' to 'SUSE' in inspect_collector_test 
This is needed due to the change in #33564
 2016-06-17 10:56:42 -06:00
Justin Findlay
6d0d52fa86 modules.pkg int tests: skip refresh_db upon error (#34072) 2016-06-17 09:35:47 -06:00
Thomas S Hatch
c05296b035 Merge pull request #34004 from isbm/isbm-no-minionid-sorting-dev 
Complete rewrite how Minion ID is generated (dev)
 2016-06-17 09:15:58 -06:00
Daniel Hobley
182373344e Moved to using run_all in the absent function 
- Fixed unit tests
 2016-06-17 16:13:38 +02:00
joelc
f16839c83b typo 2016-06-17 08:31:49 -05:00
joelc
ec31f7a7d4 Adds delete functionality to mac_defaults 2016-06-17 08:25:42 -05:00
Pablo Suárez Hernández
d78d57b717 Test fixed: get OS grain from /etc/os-release if possible 2016-06-17 13:32:57 +01:00
Pablo Suarez Hernandez
d80e0532ff fix: osarch_mock 2016-06-17 13:32:57 +01:00
Pablo Suarez Hernandez
db00ec756d osarch mock for unit test 2016-06-17 13:32:57 +01:00
Pablo Suarez Hernandez
dabc5cab7e lint fix 2016-06-17 13:32:56 +01:00
Pablo Suarez Hernandez
9ac514724b testing if SUSE os grain is set from /etc/os-release 2016-06-17 13:32:56 +01:00
rallytime
d957c29704 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/master.py
  - salt/utils/parsers.py
 2016-06-16 17:08:39 -06:00
rallytime
37cfe70724 Add some grains targeting tests 2016-06-16 17:02:46 -06:00
rallytime
f6bfaede21 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/installation/index.rst
  - salt/master.py
  - salt/modules/mac_brew.py
  - salt/modules/pacman.py
  - salt/modules/solarisips.py
  - salt/returners/postgres_local_cache.py
  - salt/states/apache_module.py
  - salt/utils/minions.py
  - tests/unit/acl/client_test.py
 2016-06-16 16:10:41 -06:00
Thomas S Hatch
5a792caa57 Merge pull request #34068 from jfindlay/disk_capacity 
Add docs and tests to disk state
 2016-06-16 15:18:13 -06:00
Thomas S Hatch
ccc07c8d32 Merge pull request #33762 from plastikos/bug-proxy_exit_status 
[BUG] proxy exit status
 2016-06-16 14:53:07 -06:00
rallytime
60561ac6fc Add a test to check for disconnected minion messaging 2016-06-16 14:07:05 -06:00
Justin Findlay
dca04727b5 states.disk: rewrite unit tests 2016-06-16 12:49:36 -06:00
Thomas S Hatch
c76123767c Merge pull request #33903 from meaksh/salt-os-family-does-not-detect-SLES-for-SAP 
Fetching grains['os'] from /etc/os-release on SUSE systems if it is possible
 2016-06-16 11:21:09 -06:00
Thomas S Hatch
bf3e7c83b0 Merge pull request #33837 from lorengordon/masterless-orchestration 
Support salt.state orchestration in masterless mode
 2016-06-16 11:16:53 -06:00
rallytime
9d049e28e5 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/disk.py
 2016-06-15 17:13:26 -06:00
Collin Richards
be4a7c3f43 Fix more pylint issues 2016-06-15 17:50:05 -05:00
Thomas S Hatch
73ff11585e Merge pull request #33987 from isbm/isbm-inspectlib-cleanup 
inspectlib cleanup
 2016-06-15 16:09:31 -06:00
Nicole Thomas
f546a00dc9 Merge pull request #34025 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-15 15:41:00 -04:00
Nicole Thomas
b3751f481f Fix wheel integration test (#34040) 2016-06-15 15:40:15 -04:00
Collin Richards
0ea317ce5f Fix misc whitespace and formatting issues 2016-06-15 14:34:54 -05:00
Loren Gordon
f7fd2962cb Update saltmod tests to use master __opts__ 2016-06-15 14:12:53 -04:00
Bo Maryniuk
6dcdc59f7e Fix lint: unused import 2016-06-15 14:41:43 +02:00
Bo Maryniuk
921c399305 Add unit test: addrinfo from the raw socket should be picked up if all other socket checks had failed to localhost 2016-06-15 14:09:12 +02:00
Bo Maryniuk
4df1b542de Add unit test: check if FQDN is picked up 2016-06-15 14:08:41 +02:00
Bo Maryniuk
a31b7aedfc Add unit test: minion ID should be localhost, if everything is localhost. 2016-06-15 14:08:13 +02:00
Bo Maryniuk
97ef3bdb76 Test fix: only non-localhost IP should persist 2016-06-15 14:07:29 +02:00
Bo Maryniuk
263c039db9 Test fix: look for attribute name only when other socket checks had failed 2016-06-15 14:06:50 +02:00
Bo Maryniuk
be00b90067 Remove unnecessary tests: no fallback to what was already looked at 2016-06-15 13:45:54 +02:00
Collin Richards
e505a8e852 Add get/set datetime functionality - system module 
Implement {get,set}_system_{time,date_time,date} functions
in system module for posix/linux machines. These functions
already exist in the win_system module, however there isn't
currently a way to set the date/time on linux/posix systems.

Includes two methods for setting the date/time.
    - Using the date program (posix)
    - Using the linux function clock_settime function (linux)

Adds UTC functionality that isn't currently included in the windows
date/time module.
 2016-06-14 17:19:21 -05:00
rallytime
77f44f3087 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/zypper.py
  - salt/states/pkg.py
  - tests/integration/output/output.py
 2016-06-14 15:47:35 -06:00
Nicole Thomas
871f7966ce Lint fix for #34000 (#34005) 2016-06-14 11:12:14 -04:00
Mike Place
f758e42172 Fix incorrectly written test (#34000) 
This should be using the test suite method of generating opts
 2016-06-14 11:10:21 -04:00
Bo Maryniuk
2dc9e693f5 Fix lint 2016-06-14 16:37:11 +02:00
Bo Maryniuk
ef84253e7e Fix netmask test. 2016-06-14 16:34:44 +02:00
Bo Maryniuk
ffeaff003f Fix typo 2016-06-14 16:33:18 +02:00
Bo Maryniuk
22f3bab2ca Fix the documentation 2016-06-14 16:29:07 +02:00
Bo Maryniuk
085901470e Add unit test check for non-localhost IP is accepted as a minion ID 2016-06-14 16:29:07 +02:00
Bo Maryniuk
bce6798e86 Add unit test to check if any of localhost or local IP addresses are filtered 2016-06-14 16:29:07 +02:00
Bo Maryniuk
47755c69ea Add unit test to filter out localhost from the first occurrence 2016-06-14 16:29:07 +02:00
Bo Maryniuk
15ecb083e3 Add test for the first in line from platform.node is used (mostly) 2016-06-14 16:29:06 +02:00
Bo Maryniuk
eed433ec60 Add unit test to check on duplicate hostnames in the pool 2016-06-14 16:29:06 +02:00
Bo Maryniuk
71a3e91f57 Add unit test for check if the minion ID is distinct in the pool 2016-06-14 16:29:06 +02:00
Bo Maryniuk
a3266c6f2f Fix network test for Solaris 2016-06-14 16:29:06 +02:00
Bo Maryniuk
2d4a9939a9 Rename network unit test into a proper name 2016-06-14 16:29:06 +02:00
Bo Maryniuk
fe300ccf73 Lintfix 2016-06-14 09:39:04 +02:00
Mike Place
9bd2317992 Merge pull request #33951 from jfindlay/gem_tests 
modules.gem int tests: more fixes
 2016-06-13 17:46:43 -07:00
Mike Place
53baae6eb1 Merge pull request #33984 from jfindlay/disk_capacity 
Add docs and tests to disk state
 2016-06-13 17:43:38 -07:00
Mike Place
fa5efb6a69 Merge pull request #33985 from rallytime/more-batch-tests 
Write some more simple batch command tests
 2016-06-13 17:38:05 -07:00
rallytime
3e7ab8c7b3 Write some more simple batch command tests 2016-06-13 16:25:19 -06:00
Bo Maryniuk
96423076b1 Add unit test for file tree 2016-06-14 00:25:08 +02:00
Justin Findlay
6cbe31e6c2 states.disk: rewrite unit tests 2016-06-13 16:13:40 -06:00
Bo Maryniuk
8975036b27 Add get_unmanaged_files test 2016-06-14 00:05:34 +02:00
Justin Findlay
6080846cce acl.ClientACL: add unit tests (#33684) 2016-06-13 16:00:35 -04:00
Justin Findlay
2eb633ccad modules.gem int tests: only check known installed gems 2016-06-13 11:33:25 -06:00
rallytime
c57bcebaf8 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/boto_lambda.py
 2016-06-13 11:18:53 -06:00
Justin Findlay
9f3e18b037 modules.gem int tests: (un)install a non-core gem 2016-06-13 10:46:56 -06:00
Bo Maryniuk
be5f12fcaf Add initial unit test for inspectlib.collector.Inspector 2016-06-13 18:17:28 +02:00
Mike Place
18df7263ac Merge pull request #33955 from adamchainz/readthedocs.io 
Convert readthedocs links for their .org -> .io migration for hosted projects
 2016-06-13 08:49:35 -07:00
Aditya Kulkarni
34135e1f67 Add runner for execution modules (#33949) 
* Add runner for execution modules

* Make sure all modules load and fix argument passing

* Fix lint error

* Add docs for salt runner
 2016-06-13 11:49:26 -04:00
Pablo Suárez Hernández
1afc12f6d1 Test fixed: get OS grain from /etc/os-release if possible 2016-06-13 10:19:17 +01:00
Adam Chainz
64d9a62f89 Convert readthedocs links for their .org -> .io migration for hosted projects 
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
 2016-06-11 12:33:37 +01:00
rallytime
b4ab322ce1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/saltutil.py
 2016-06-10 13:41:53 -06:00
Nicolas Delaby
f806c7e290 [boto_lambda] handle ommitted Permissions parameter (#33908) 
* a bit of pep8

* Don't fail if `Permssions` is None
 2016-06-10 13:31:22 -04:00
Mike Place
378dd7ca06 Merge pull request #33888 from jfindlay/random_check 
random.org checks
 2016-06-10 08:45:07 -07:00
Mike Place
abf5131c0a Adds absolute value option to disk state (#33918) 2016-06-10 11:08:57 -04:00
Pablo Suarez Hernandez
a0693aafcb fix: osarch_mock 2016-06-10 09:48:37 +01:00
Pablo Suarez Hernandez
1680f18556 osarch mock for unit test 2016-06-10 08:51:33 +01:00
Pablo Suarez Hernandez
63e2f27fa6 lint fix 2016-06-09 21:33:06 +01:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
 2016-06-09 13:06:10 -06:00
Nicole Thomas
08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3 
[develop] Merge forward from 2016.3 to develop
 2016-06-09 14:12:48 -04:00
Pablo Suarez Hernandez
7f7800ffc9 testing if SUSE os grain is set from /etc/os-release 2016-06-09 15:09:00 +01:00
Justin Findlay
82f95429db modules.random_org unit tests: skip if random.org down 2016-06-08 20:46:20 -06:00
rallytime
b8e4706074 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/saltutil.py
  - salt/states/archive.py
 2016-06-08 14:26:18 -06:00
Thayne Harbaugh
0fff44644e Handle case where PYTHONPATH environment var is not set. 2016-06-08 14:02:57 -06:00
rallytime
595d4f2ac3 Fixup new groupadd tests for syntax change in 2016.3 2016-06-08 12:42:52 -06:00
rallytime
c5b4ec0b0f Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/salt.py
  - salt/modules/groupadd.py
  - salt/states/service.py
 2016-06-08 11:20:18 -06:00
Mike Place
01aaf3e2a9 Merge pull request #33771 from twangboy/win_dism 
Additional functionality to win_dism.py
 2016-06-08 06:58:20 -07:00
Mike Place
f7b3d0eda0 Merge pull request #33839 from cachedout/fix_pkgresource_test_stacktrace 
Fix another unit test stacktrace in pkg_resource
 2016-06-08 06:32:55 -07:00
Mike Place
5f081ef31c Merge pull request #33840 from cachedout/remove_matcher_unit_tests 
Remove matcher tests
 2016-06-08 06:31:41 -07:00
Nicolas Delaby
0d40e1c4f3 Add support for edge case when Cmd and Entrypoint can't be blanked 2016-06-08 10:46:24 +02:00
Mike Place
6297448377 Remove matcher tests 
These all assert directly against mock objects. They're pointless.
 2016-06-07 16:36:01 -06:00
Mike Place
435547a747 Fix another unit test stacktrace in pkg_resource 2016-06-07 15:55:52 -06:00
Mike Place
453fb1ac91 Fixing more stupid unit tests 
This time win_servermanager
 2016-06-07 15:33:12 -06:00
twangboy
9be45fe37a Fix some more lint 2016-06-07 13:17:29 -06:00
twangboy
421dc97957 Fix/add unit tests for state 2016-06-07 12:52:01 -06:00
twangboy
8d66fac74c Add missing unit tests 2016-06-07 09:53:22 -06:00
Mike Place
1db559afe9 Merge pull request #33805 from jfindlay/pkg_tests 
states.pkg int tests: skip if pkg mgr unavailable
 2016-06-07 07:40:46 -07:00
Mike Place
3984b65486 Merge pull request #33808 from jfindlay/gem_tests 
fix some problems with the gem module integration tests
 2016-06-07 07:40:25 -07:00
Justin Findlay
f13f914755 states.service: add integration tests 2016-06-06 23:11:49 -06:00
Justin Findlay
f7c19a1a58 modules.gem int tests: relax version checks 2016-06-06 21:58:58 -06:00
twangboy
60f856f73d Fix unit tests for module 2016-06-06 18:33:29 -06:00
Justin Findlay
0c069ddc95 states.pkg int tests: skip if pkg mgr unavailable 2016-06-06 17:44:43 -06:00
Justin Findlay
6af47d2ba7 modules.gem int tests: remove pkgs before testing install 2016-06-06 17:32:17 -06:00
Mike Place
db3cc8dcee Merge pull request #33779 from bodhi-space/develop 
INFRA-1594 - Add various S3 functions needed for optionally emptying …
 2016-06-06 14:52:07 -07:00
Tom Williams
102d696460 INFRA-1594 - fix up unit tests 2016-06-06 14:37:38 -04:00
Jeffrey 'jf' Lim
ffa788fd67 Fix minor typo in test name in tests/unit/states/dockerng_test.py 2016-06-07 01:11:30 +08:00
Justin Findlay
90aee79c39 states.service.mod_watch: update unit test 2016-06-06 10:54:16 -06:00
Mike Place
7fdfbe9a28 Merge pull request #33691 from jtand/gem_integration_test 
Gem integration test
 2016-06-06 04:13:23 -07:00
Dan Slimmon
f87bc347fd Fixed ACL user comparison. Resolves #33754. 2016-06-04 15:14:00 +00:00
Jeffrey 'jf' Lim
9cf25e160f Fix #33500: allow for sys.list_modules to list a module when given an exact match 2016-06-04 12:51:47 +08:00
Jeffrey 'jf' Lim
738e5c5823 Fix integration test_list_modules_with_arg: pass 'u*' arg correctly 2016-06-04 12:18:16 +08:00
Thayne Harbaugh
bfc12b342b Integration tests for salt-proxy exit status. 2016-06-03 14:47:23 -06:00
Thayne Harbaugh
88ce32ae80 Improvements and bugfixes to testprogram utilities 
* Automatically add --proxyid to salt-proxy arguments

* Add parameters to disable automatic adding of arguments and environment
  settings: .run() now takes verbatim_args and verbatim_env

* salt-proxy uses salt-minion.pid file

* Simplify .shutdown()

  + pass timeout to .wait_for_daemon_pid()

  + attempt kill before checking timeout value

  + Testing for "no such pid" (case that process was already dead) was
    previously incorrect, but was masked due to (what should have been) a
    superfluous call to salt.utils.process.os_is_running()
 2016-06-03 14:47:23 -06:00
Thayne Harbaugh
b8b74fcbe0 Remove unused code 2016-06-03 14:47:23 -06:00
Mike Place
a5684ed123 Merge pull request #33670 from rallytime/fix-33605 
Handle non-ascii package names in state.format_log
 2016-06-03 09:16:52 -07:00
Mike Place
11e39e7203 Merge pull request #33712 from meaksh/fix-for-groupadd-module-failures-in-SLE11-2015.8 
Fix for groupadd execution module failures in SLES11 systems
 2016-06-03 09:13:06 -07:00
Mike Place
1001d2b9e7 Merge pull request #33733 from plastikos/test-master_exit_status 
Test master exit status
 2016-06-03 08:27:28 -07:00
Justin Anderson
ff2dae103d ubuntu doesn't install default gems when ruby is installed 2016-06-03 08:54:51 -06:00
C. R. Oldham
35bc42410f Merge pull request #33705 from alexbleotu/json_schema_extension-gh 
JSON Schema Extension
 2016-06-03 08:42:18 -06:00
Alexandru Bleotu
d69ce3a84f JSON Schema Extension 
- added support for JSON schemas that validate complex JSON objects
  (JSON objects that have as attributes other JSON objects)
 2016-06-03 14:03:26 +01:00
Pablo Suárez Hernández
ab738416ba pylint fix 2016-06-03 13:57:13 +01:00
Pablo Suárez Hernández
bf27e5d36e test_members cleanup 2016-06-03 13:25:05 +01:00
Pablo Suárez Hernández
ba815dbf76 improvements on groupadd unit tests 2016-06-03 13:17:13 +01:00
Justin
504df9a65a Fixed lint error 2016-06-03 04:28:42 -06:00
Justin Findlay
87e018af2a states.test.configurable_test_state: add unit tests 2016-06-02 17:20:36 -06:00
Thayne Harbaugh
a46750c8c5 Various tests to validate proper `salt-master` exit status: 
* Test when ``user`` config setting is an invalid user.

* Test when an unknown argument is given.

* Test Correct ``salt-master`` daemon start up.
 2016-06-02 17:03:59 -06:00
Thayne Harbaugh
68a9912d3a Refactor `testprogram` framework to minimize explicit setup and improve reuse. 
* Add a ``testprogram.TestProgramCase()`` to simplify test classes

  + Has ``setUp()`` and ``tearDown()`` to create ephemeral test directory
    (really should be moved to salttesting.TestCase)

  + Common ``assert_exit_status()`` for validating and reporting failures in
    exit status.

* Add missing ``testprogram.TestDaemonSaltProxy`` class

* Remove specific setting of ``program`` parameter in initialization of
  ``TestDaemonSaltMinion`` since ``testprogram.TestSaltProgramMeta`` already
  handles that unless a specific override is required.

* Automatically set ``user`` in config for master, minion and proxy test
  classes if a specific user is not specified.

* Automatically set ``PYTHONPATH`` as ``sys.path`` unless it is specified.
 2016-06-02 16:51:54 -06:00
Justin Anderson
0cb1bfa0d3 Removed extra : 2016-06-02 16:35:40 -06:00
Justin Anderson
ebee8a89af glance.warn_until shouldn't be checked for a doc string 2016-06-02 16:30:36 -06:00
Justin Anderson
86f59b3e80 Made more pythonic 2016-06-02 14:37:05 -06:00
Justin Anderson
2f36f34981 Fixed salt.util import. Added status check to make sure external resource is available 2016-06-02 14:32:08 -06:00
rallytime
59bd51f4c8 Update test to correct iteration 2016-06-02 14:32:21 -04:00
Mike Place
64c7dd7032 Merge pull request #33626 from evonzee/feature/issue-15749 
Feature/issue 15749
 2016-06-02 11:23:36 -07:00
Mike Place
38515a01f8 Merge pull request #33664 from DSRCompany/issues/26311_single_schedule 
Single schedule for MultiMinion, EventBus managed by MultiMinion.
 2016-06-02 10:42:00 -07:00