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
69,848 Commits 24 Branches 182 Tags 341 MiB
1a4833b3a1
Commit Graph

7313 Commits

Author SHA1 Message Date
Thomas S Hatch
40081176af Merge pull request #34529 from Ch3LL/add_skip_verify_archive 
Add skip_verify for archive.extracted
 2016-09-06 15:05:31 -06:00
Pablo Suárez Hernández
71ebf2c8cd Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-06 12:41:56 +01:00
Daniel Wallace
65b6734c04 catch unicode encoding errors in json outputter (#36033) 
Add testing too
 2016-09-02 14:56:09 -06:00
rallytime
a63c9dfc6a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/service.py
 2016-09-02 08:19:16 -06:00
Mike Place
6cf56843d4 Revert "service state integration tests" 2016-09-02 21:38:15 +09:00
rallytime
d7380d83be requires_system_grains decorator needs a grains=None kwarg 2016-08-31 11:35:02 -06:00
Mike Place
a238666aba Add serializer test 2016-08-31 23:16:40 +09:00
Ch3LL
38203e3d2c add tornado web app to serve up static file for test 2016-08-30 15:43:28 -06:00
rallytime
b20f6b9384 Catch CommandExecutionError when group_installed doesn't exist 
Includes an integration test to make sure this doesn't regress.

Fixes #35819
 2016-08-30 11:44:17 -06:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
 2016-08-26 13:21:12 -06:00
Hengyang Hu
b89f45598e fix 34241, webutil.useradd_all is deprecated (#35788) 
* fix 34241, webutil.useradd_all is deprecated

* in src webutil.useradd_all get replaced by webutil.useradd, change the mocks accordingly
 2016-08-26 12:52:11 -06:00
Erik Johnson
eb4d2f299b Better unicode handling in gitfs (#35802) 
* Revert "Don't use six.text_type() in salt.utils.gitfs"

This reverts commit d76659a63a.

* salt.utils.path_join: handle mixed unicode/binary-unicode paths

* Add test for mixed unicode and binary-unicode paths

* salt.utils.gitfs: replace os.path.join with salt.utils.path_join
 2016-08-26 10:44:22 -06:00
Thomas S Hatch
b3f6367621 Merge pull request #35753 from rallytime/fix-client-unit-test 
Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720
 2016-08-25 09:55:23 -06:00
rallytime
92f8c836e8 Add cmd_mock back in to function spec 2016-08-25 07:05:52 -06:00
rallytime
a671f0a092 Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720 
Refs #35720
 2016-08-24 17:48:45 -06:00
rallytime
61e37d5956 Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/loader.py
  - salt/modules/s3.py
  - salt/utils/s3.py
  - tests/unit/modules/s3_test.py
 2016-08-24 09:58:56 -06:00
Daniel Wallace
2d2bc1ffea use aws.get_location in s3 modules 
Also load the __utils__ into pillar and fileserver and fileclient so
that this function can be used there with __opts__.

Also sets the default for s3 to 'us-east-1' like it is documented.

Closes #30976
Closes #28913
 2016-08-23 12:12:15 -05:00
Nicole Thomas
9fe0972761 Merge pull request #35662 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-22 13:03:43 -06:00
Justin Anderson
64974c89d9 Backport #35627 to 2016.3 (#35661) 
* This test was doing all sorts of things, raging from simply failing
to driving CPUs to 100%, to leaking memory until the entire test suite crashes.

This seems to happen only in conjunction with running the entire unit test suite
and does not occur on its own

cc: @kraney

* Better method to skip test. This way we can track it.
 2016-08-22 13:03:24 -06:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-22 09:29:13 -06:00
Mike Place
4153aeba29 Merge pull request #35605 from rallytime/bp-32739 
Back-port #32739 to 2016.3
 2016-08-20 10:39:38 +09:00
Thomas S Hatch
c9070c212f Merge pull request #35569 from rallytime/test-for-35384 
Write test for multiple unless commands where 1st cmd passes and 2nd fails
 2016-08-19 13:28:01 -06:00
rallytime
f2eb625778 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-19 11:13:15 -06:00
abednarik
36d8b4a409 Rsync synchronized updates. 
Aadded --dry-run option which is also used for test mode
taking adventage of this option in rsync.

Update state documentation to follow Salt standards

Finally synchronized was not working, See #32478. Changes cmd.run to cmd.run_all make this works.
Tests updated
 2016-08-19 10:42:37 -06:00
Erik Johnson
4f0b3be20c Fix localemod tests (#35583) 
This changes the mocking for the context variables to reflect changes
made in 5b12f03.
 2016-08-18 20:56:20 -06:00
Erik Johnson
beb6ca8ef9 Update linux_sysctl tests to reflect new context key (#35584) 
* Update docstring to reflect optional context argument

It used to not be optional.

* Update linux_sysctl tests to reflect new context key

This key was changed in 5b12f03, this updates the tests to reflect the
change.
 2016-08-18 20:56:08 -06:00
rallytime
2930df924e Update localemod_test systemd.sd_booted mock to use salt.utils.systemd.booted 
This brings these tests inline with the changes made to salt.utils.systemd.booted
in #35510
 2016-08-18 13:31:26 -06:00
rallytime
e61b04a707 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/digital_ocean.py
  - salt/cloud/clouds/ec2.py
  - salt/cloud/clouds/libcloud_aws.py
  - salt/cloud/clouds/opennebula.py
  - salt/cloud/clouds/rackspace.py
  - salt/cloud/clouds/softlayer.py
  - salt/cloud/clouds/softlayer_hw.py
  - salt/cloud/clouds/vmware.py
  - salt/loader.py
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/pacman.py
  - salt/modules/systemd.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/utils/cloud.py
 2016-08-18 12:09:51 -06:00
rallytime
30f42d5352 Write test for multiple unless commands where 1st cmd passes and 2nd fails 
This is a regression integration test for #35384, which was fixed by #35545,
and back-ported to the 2015.8 branch in #35566.
 2016-08-18 11:04:08 -06:00
Mike Place
205d8e2e7b Merge pull request #35483 from gtmanfred/2015.8 
use __utils__ in salt.cloud
 2016-08-18 22:32:22 +09:00
Thomas S Hatch
fd3274c800 Merge pull request #35510 from terminalmage/issue33516 
Better systemd integration
 2016-08-17 12:54:11 -06:00
Erik Johnson
5b5f19d269 Update zypper unit test to reflect call to config.get 2016-08-17 11:43:22 -05:00
rallytime
c305d8d99b Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/conf.py
  - tests/runtests.py
 2016-08-17 10:37:57 -06:00
Erik Johnson
f83e0ef242 Add unit tests for salt.utils.systemd 2016-08-17 11:30:14 -05:00
Mike Place
9f87081cef Merge pull request #35302 from Ch3LL/add_job_cache_test 
Add job cache test
 2016-08-17 19:45:28 +09:00
Mike Place
c1deb945d7 Merge pull request #35429 from tankywoo/fix-iptables-target-options 
Fix iptables target options with no arguments
 2016-08-17 19:05:17 +09:00
Ch3LL
ccb2a5cadf remove unused imports 2016-08-16 15:21:20 -06:00
Ch3LL
512ae81dfd remove TMP and add integration.TMP 2016-08-16 15:18:24 -06:00
Daniel Wallace
2d8ec1e9db use __opts__ in salt.utils.cloud for cache functions 2016-08-16 12:03:45 -05:00
rallytime
c6c82be1de Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
 2016-08-16 11:02:05 -06:00
Thomas S Hatch
240fc12863 Merge pull request #35413 from cachedout/issue_35296 
Resolve path issues with cp.push
 2016-08-16 10:40:39 -06:00
Tanky Woo
914eb60d51 Fix iptables target options with no arguments 
For example:

  - name: test
    jump: CT
    notrack: ''
    ...
 2016-08-16 16:00:00 +08:00
Mike Place
1473474b04 Merge pull request #35451 from isbm/isbm-zypper-mod_repo-unchanged 
Bugfix: zypper mod repo unchanged
 2016-08-16 10:38:25 +09:00
anthony-shaw
e427815caf fix clrf 2016-08-15 16:30:58 -06:00
anthony-shaw
06530b5461 add a test to check existing functionality is broken 2016-08-15 15:53:05 -06:00
Graham McCullough
ae5b233d51 fixes #34279 2016-08-15 14:34:20 -07:00
Nicolas Delaby
49af330492 Docker 1.12 reports tags as null (#35447) 
Add support for this new value.
 2016-08-15 10:58:50 -06:00
Bo Maryniuk
8790197d86 Fix Unit test for suppressing the exception removal on non-modified repos 2016-08-15 17:35:25 +02:00
Mike Place
3646cf1afa Additional checks on master and integration test 2016-08-12 20:06:20 +09:00
Mike Place
fc0d5878bc Set file_recv on test master 2016-08-12 19:08:27 +09:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
 2016-08-11 11:33:54 -06:00
Mike Place
69a108e9fa Raise SaltRenderError on bad requisite (#35373) 
* Raise SaltRenderError on bad requisite

Refs #35226

* Remove extra vals
 2016-08-11 10:48:23 -06:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359) 
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
 2016-08-11 10:45:24 -06:00
Mike Place
0fcfc70cc8 Merge pull request #35356 from jfindlay/log_levels 
document log levels and warn on all logging below info
 2016-08-11 09:45:55 +09:00
Justin Findlay
2fc3a55338 utils.verify.verify_log: warn at all levels less than info 2016-08-10 14:10:43 -06:00
rallytime
a651962e95 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-10 10:02:03 -06:00
Ch3LL
c9b7c3cf80 need to add returners option in other places 2016-08-09 13:53:42 -06:00
Erik Johnson
243909f39d file.recurse: Do not convert octal mode string to int (#35309) 
* Add integration test for #34945

* file.recurse: Do not convert octal mode string to int

When we run file.makedirs_perms to create the dest directory, we pass
through the mode to file.check_perms. However, file.check_perms expects
an octal string, not an int. This causes the initial directory to be
chmod'ed to the wrong mode. When there are files in the source
directory, file.recurse will invoke the file.directory state to manage
files/dirs in that directory, and this ends up correcting the mode as we
simply pass the dir_mode to it. However, when there are only directories
in the source directory, this never happens and the incorrect mode
remains on the destination directory.

Fixes #34945.
 2016-08-09 13:02:26 -06:00
rallytime
2d3eadfe49 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-09 11:15:48 -06:00
Ch3LL
7316df7a02 fix pylint 2016-08-09 10:35:01 -06:00
Mike Place
ce7aeb6ca4 Merge pull request #35227 from isbm/isbm-osfinger-ubuntu-fix 
Isbm osfinger ubuntu fix
 2016-08-10 00:38:30 +09:00
Ch3LL
50a4f0fe6a fix comment 2016-08-09 09:26:51 -06:00
Erik Johnson
d621aa7b61 Update runner/wheel unit tests to reflect new key in ret dict 2016-08-09 08:49:52 -05:00
Ch3LL
6837acf742 add job cache integration tests 2016-08-08 17:01:02 -06:00
rallytime
2b4c156df1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/grains/core.py
  - salt/output/highstate.py
 2016-08-08 11:15:43 -06:00
Pablo Suárez Hernández
18700e821e unit tests for rpm.checksum() and zypper.download() 
lint issue fixed
 2016-08-08 11:57:14 +01:00
Mike Place
6714e8f386 Fix mock call in disk wipe test 2016-08-07 06:57:20 +09:00
Erik Johnson
e2e8bbbfde Add integration test for #35214 2016-08-05 20:47:24 -05:00
Bo Maryniuk
fe5da97283 Lintfix: E8303 2016-08-06 00:27:34 +02:00
Bo Maryniuk
4dc45f2509 Add grains unit test for Ubuntu systems 2016-08-05 11:55:02 +02:00
Mike Place
dd91006ed7 Merge pull request #35120 from kstreee/fix-missing-first-stream-data 
The '_handle_event_socket_recv' function in Salt Api is missing first data of stream.
 2016-08-02 10:22:50 -06:00
kstreee
28f793caac Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-08-02 07:37:25 +00:00
Mike Place
d137c4b986 Merge pull request #34955 from lubyou/fix-dism-on-non-english-systems 
force dism to always output english text
 2016-08-01 06:54:03 -06:00
rallytime
65f9365ee0 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-28 11:05:54 -06:00
rallytime
35696ad637 Pylint fix 2016-07-27 15:12:41 -06:00
Mike Place
f9fd6ddd8a Fixup #33875 2016-07-27 13:25:59 -06:00
Eu
56b1f6c651 Fix naive fileserver map diff algorithm 
Naively comparing sorted dict keys does not guarantee that maps are equal. We
must compare mtimes for filenames in case keys are the same to make sure there
isnt a modified file.
 2016-07-27 13:24:19 -06:00
rallytime
a7d4f93697 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/integration/__init__.py
 2016-07-27 11:35:16 -06:00
Mike Place
b58c663d8d Merge pull request #34991 from cachedout/ssh_timeout 
SSH timeout
 2016-07-27 11:24:37 -06:00
Mike Place
5f8370ae8d Refine errors in client (#34976) 
* Refine errors in client

Check for the existence of cache data

* Adjust tests for new return string
 2016-07-27 11:05:31 -06:00
Mike Place
39cd8da399 Lint diff against salt-testing 2016-07-27 10:42:44 -06:00
Mike Place
443e5cdde2 Add timeout to ssh tests 2016-07-27 10:40:02 -06:00
Mike Place
2d3b95dec9 Merge pull request #34971 from cachedout/increase_timeout_grains_test 
Increase timeout for grains test
 2016-07-26 16:11:29 -06:00
Mike Place
82d271b43a Increase timeout for grains test 2016-07-26 16:10:30 -06:00
Johannes Scholz
775ea73578 fix unit tests 2016-07-26 19:46:14 +02:00
Mike Place
d80350cdcc Increase all run_script timeouts to 30s (#34956) 2016-07-26 10:54:45 -06:00
rallytime
8b295fe4ea Merge branch '2015.8' into '2016.3' 
Conflicts:
salt/config/__init__.py
salt/utils/parsers.py
tests/integration/__init__.py
 2016-07-25 14:13:44 -06:00
Ch3LL
617f5680e4 add windows path and add custom tar 2016-07-22 17:51:41 -06:00
Mike Place
8becec2f4f Backport #34906 2016-07-22 17:22:50 -06:00
rallytime
109b368d19 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-22 10:32:59 -06:00
Erik Johnson
1ca1367289 Fail git.latest states with uncommitted changes when force_reset=False (#34869) 
* Add git.diff function

* Fail git.latest states with uncommitted changes when force_reset=False

Also, discard these changes when running the state if force_reset=True.

* Add integration test for case where there are uncommitted changes
 2016-07-22 09:04:05 -06:00
Mike Place
b4be66dedf Fix wheel test 
Fix random ordering bug
 2016-07-21 13:54:32 -06:00
rallytime
15b4f5a8b3 Skip GCE unit tests - causes test suite to hang 2016-07-21 10:53:00 -06:00
rallytime
094731f4b6 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-20 12:32:08 -06:00
Justin Anderson
9abb6f91bb Skip mysql state test if mysqladmin is not available 2016-07-20 09:24:24 -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
Bo Maryniuk
110a422d5a Keep osmajorrelease as a string type for 2016.3 release 2016-07-19 17:52:08 +02:00
rallytime
3e032dc397 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-19 09:30:45 -06:00
Mike Place
10a1af9949 Remove unnedeed config test (#34751) 
Refs #34607
 2016-07-18 13:00:47 -06:00
Mike Place
46901c6e65 Disable test 
There's a race condition in here somewhere. Disabling and tracking issue elsewhere.
 2016-07-18 12:39:49 -06:00
Justin Anderson
b94e0dd95a ipset.long_range doesn't need a docstring 2016-07-18 10:32:32 -06:00
Mike Place
4625ee65b8 Remove unnedeed config test 
Refs #34607
 2016-07-18 09:12:18 -06:00
rallytime
cca9446c37 Various spelling fixes 
Fixes #34630
 2016-07-16 13:17:09 -06:00
Bo Maryniuk
96021e257c Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:13:58 +02:00
Bo Maryniuk
5ed5142fbc Update test data for 'registerrelease' and 'productline' fields 2016-07-15 17:12:03 +02:00
rallytime
0c566dce89 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-14 14:06:42 -06:00
Mike Place
64a154826a Revert "Modify lodaer global test to use populated dunders" 
This reverts commit f45dbe8508df70ce3f563915318791614449b341.
 2016-07-14 12:11:44 -06:00
Bo Maryniuk
208fd33b48 Add unit test for osmajorrelease grain 2016-07-14 18:05:12 +02:00
Nicole Thomas
bc63f25a6f Lint 34644 (#34651) 
* Better error handling for __virtual__ in dockerng module

* Modify lodaer global test to use populated dunders

This prevents a number of errors in the error log and makes for a
more robust test IMHO

* Lint #34644
 2016-07-13 18:58:54 -04:00
Mike Place
50360263c5 Adjust the mine test a little bit to give it a better chance of success (#34647) 2016-07-13 16:51:28 -04:00
Justin Anderson
dd1559a599 Check that mysqladmin exists before running mysql integration tests. 2016-07-13 11:08:26 -06:00
Mike Place
3e612c3794 Merge pull request #34618 from jtand/network_integration_fix 
Network state integration test test=True
 2016-07-13 10:30:15 -06:00
Megan Wilhite
f6dfbac5ca add num_cpus grain to freebsd (#34565) 
* add num_cpus grain to freebsd

* fix pylint
 2016-07-13 11:40:09 -04:00
Justin Anderson
445f8afc69 Fixes failing test on Suse Leap (#34621) 2016-07-12 18:48:06 -04: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
rallytime
3026df346f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-12 13:27:16 -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
57df38e685 Update github IP for ssh state integration tests (#34592) 2016-07-12 15:17:41 -04:00
Nicole Thomas
efc2ab9d68 [2016.3] Avoid salt.utils circular imports when using "from" (#34585) 
Also removes an unused import
 2016-07-12 15:13:26 -04:00
Justin Anderson
34bcf9ccfc Changed network state test to use test=True 2016-07-12 12:40:40 -06:00
Nicole Thomas
2e1007254b Avoid circular imports when calling salt.utils functions (#34584) 2016-07-12 13:41:30 -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
Justin Anderson
b2616833b0 Some small changes 2016-07-11 14:35:25 -06:00
rallytime
815c8b38d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-08 10:34:32 -06:00
rallytime
f8a3622be7 Rename unit.states.boto_secgroup to unit.states.boto_secgroup_test 2016-07-07 21:29:36 -06:00
rallytime
ceefb6e34c Rename tests.unit.simple to tests.unit.simple_test 
These tests are not getting run automatically in a ./runtests.py -u
or on Jenkins runs. This name changes allows them to run automatically.
 2016-07-07 17:12:27 -06:00
Mike Place
6b8c76af83 Prevent many errors in the test suite in loader tests (#34521) 
Pack in what the loader needs.
 2016-07-07 17:03:45 -04:00
Ch3LL
c5035118bf add skip_verify option to archive.extracted 2016-07-07 14:42:27 -06:00
Mike Place
685df80929 Merge pull request #34518 from terminalmage/fix-pkg.latest-test 
Fix pkg.latest integration test for non-LTS ubuntu
 2016-07-07 13:29:13 -06:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
Justin Anderson
ed59113e94 Change network state integration test to use test=True 2016-07-07 12:27:18 -06:00
Erik Johnson
4aef44ecdf Fix pkg.latest integration test for non-LTS ubuntu 
This test uses ``pkg.list_upgrades`` to find a package which it assumes is
installed, to test ``pkg.installed`` with ``only_upgrade=True``. The
problem with that approach is that ``pkg.list_upgrades`` uses a dry-run
of an ``apt-get dist-upgrade`` to find the upgrades. On non-LTS Ubuntu
releases, a ``dist-upgrade`` results in upgrading to an entirely new
Ubuntu release, and new packages which would be installed by the
dist-upgrade (but are not currently installed) will be included in the
return data. This causes the test to fail when we attempt to run
``pkg.latest`` with ``only_upgrade=True`` on a package which is not
already installed.

This commit fixes the test by ensuring that our target package is
already installed, and continuing to iterate through the return data
from ``pkg.list_upgrades`` until a currently-installed package is found.
 2016-07-07 12:51:01 -05:00
Nicole Thomas
3ebba020b6 Rename some unit test files by adding _test (#34503) 
These two test files are currently not running automatically on Jenkins.
Renaming these files will add them to the full runtests.py run.
 2016-07-07 12:05:08 -04:00
Justin Anderson
75299456be Use skipTest for network state integration test (#34489) 
* Updated skipTest to check for debian or redhat

* Removed skipIf import
 2016-07-06 13:43:09 -04:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
 2016-07-06 09:12:25 -06:00
twangboy
78f7c530bb Remove unit tests, integration tests written 2016-07-05 15:12:34 -06:00
Justin Anderson
0460edb9e2 Arch linux does not have osrelease or osmajorrelease grains (#34453) 2016-07-05 15:34:41 -04:00
rallytime
91120dba01 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-05 09:58:52 -06:00
rallytime
55a91e22be Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-05 09:13:50 -06:00
Mike Place
8c72ee56e4 Merge pull request #34435 from cachedout/backport_config_dir_integration 
Backport change to integraiton test suite
 2016-07-05 08:24:53 -06:00
Mike Place
0e2c71a537 Backport change to integraiton test suite 
Will avoid lint errors in earlier branches. Thanks to @terminalmage for pointing out my error.
 2016-07-01 16:10:34 -06:00
rallytime
8398de0baf Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-30 16:08:57 -06:00
Mike Place
45b8fb10d7 Merge pull request #34373 from jtand/network_state_integration_test 
Network state integration test
 2016-06-30 08:05:44 -07:00
Erik Johnson
d6af1de0b7 Optimize pkg integration tests and add a couple new tests (#34377) 
* Remove redundant usage of destructiveTest decorator

* Remove unnecessary SLS file

This simple state can be run using run_state

* Explicitly order tests

* Use run_state instead of invoking state.sls

* Ensure only one refresh_db done during pkg integration tests

* Add pkg.latest test for package without an epoch

* Optimize pkg.latest_version usage in pkg integration tests

* Clarify outcome when only_upgrade is used

* Add pkg.latest test with only_upgrade=True
 2016-06-30 10:48:22 -04:00
rallytime
3149da1bcc Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-29 16:16:46 -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
Justin Anderson
84a36369fa Added network state integration test 2016-06-29 14:28:36 -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
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
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
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
Jorge Schrauwen
b8c6948cd5 fixes broken rm_fstab test due to missing __grain__.kernel 2016-06-25 15:42:15 +02: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
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
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
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
Mike Place
3669048654 Merge pull request #34077 from rallytime/grains-tests 
Add some grains targeting tests
 2016-06-21 09:06:30 -07:00
rallytime
b061b86946 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-20 17:22:07 -06:00
rallytime
2199bb8a78 Add integration tests for grains.append 2016-06-20 16:44:22 -06:00
Justin Anderson
b7ac6c735a Moved imports to top, out of _get_moto_version function 2016-06-20 13:20:43 -06: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
Justin Findlay
6d0d52fa86 modules.pkg int tests: skip refresh_db upon error (#34072) 2016-06-17 09:35:47 -06: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
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
rallytime
60561ac6fc Add a test to check for disconnected minion messaging 2016-06-16 14:07:05 -06: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
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
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