Commit Graph

7069 Commits

Author SHA1 Message Date
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
Justin Anderson
400a71ec33 Removed redundancies 2016-06-02 11:16:23 -06:00
Justin Anderson
91db411bea A couple lint fixes 2016-06-02 09:03:10 -06:00
Justin Anderson
c97f3319b9 Add check for gem binary 2016-06-02 08:56:09 -06:00
rallytime
b7accb0b3b Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/utils/aws.py
  - salt/utils/s3.py
2016-06-02 10:01:43 -04:00
rallytime
a580d1c6e0 Add unit test for format_log change 2016-06-02 09:26:39 -04:00
twangboy
6c7b21676a Fix lint and tests 2016-06-01 17:10:55 -06:00
Justin Anderson
210aceb402 Refactored tests to not use return messages 2016-06-01 16:57:37 -06:00
Mike Place
c8dc70b96a Merge pull request #33685 from jfindlay/get_url_test
modules.cp.get_url: add test for https://
2016-06-01 15:25:41 -07:00
Mike Place
5e022ff29c Merge pull request #33581 from dincamihai/2015.8
Call zypper refresh after adding/modifying a repository
2016-06-01 15:25:11 -07:00
Justin Anderson
9d437bd45d Removed artifact from testing 2016-06-01 15:32:41 -06:00
Justin Anderson
134e1fa888 Fixed typos, and added destructiveTest decorator 2016-06-01 15:25:18 -06:00
Justin Anderson
37bc3ad8fd Fixed typo, uninstalled to uninstall 2016-06-01 15:16:15 -06:00
Justin Findlay
2b5035fdc0 modules.cp.get_url: add test for https:// 2016-06-01 15:10:12 -06:00
Justin Anderson
5b23b91ac6 Integration test for gem module 2016-06-01 15:09:55 -06:00
rallytime
e68097445c Revert "Track down more unicode instances and add a test"
This reverts commit 9729aed262.

This isn't the right approach here. This fix needs to be more narrow.
2016-06-01 16:44:05 -04:00
rallytime
9729aed262 Track down more unicode instances and add a test 2016-06-01 13:47:29 -04:00
Mike Place
e92d6e214f Merge pull request #33646 from jfindlay/mac_tests
Fix more tmp paths on MacOS
2016-06-01 09:36:33 -07:00
Justin Findlay
c53a727c18 tests.runtests: use globally-determined tempdir
This way, the the test logs will use the same temp dir as the rest of
the test suite.  On MacOS, for example, `$TMPDIR` is set to a path that
is too long for unix sockets on the system, so the `SYS_TEMP_DIR` is set
to `/tmp` to override this.
2016-05-31 13:27:50 -06:00
Justin Findlay
8295b48459 test.integration: use hard /tmp on MacOS
Otherwise, the tests will not work as `$TMPDIR` produces a path that is
too long for unix sockets on the platform.
2016-05-31 13:27:50 -06:00
rallytime
cd05d2bed1 Fix zypper test 2016-05-31 13:43:09 -04:00
Nicole Thomas
74a7b78e00 Merge branch '2015.8' into '2016.3'
Conflicts:
  -   -   -   -   -   -   -   -   - doc/conf.py
2016-05-31 11:02:20 -04:00
Mihai Dinca
788730ea72 DRY test 2016-05-30 13:52:46 +02:00
Mihai Dinca
1d3769ccfa Improve zypper_patcher_config looks 2016-05-30 13:52:45 +02:00
Mihai Dinca
42d8d4195c Assert only gpgautoimport: True works 2016-05-30 13:51:54 +02:00
Mihai Dinca
80bfbe5c52 Reduce dicts and lists to one line where possible 2016-05-30 10:47:41 +02:00
Mihai Dinca
1d5d6d7d60 Update test method names to pass pylint 2016-05-30 10:05:07 +02:00
Dan Slimmon
180099ae9f Wrote test for broken server connection 2016-05-30 03:23:18 +00:00
twangboy
79bc7195dc Fix unit tests 2016-05-27 11:33:52 -06:00
Mihai Dinca
c7ae5907ee Call zypper refresh after adding/modifying a repository
Calling `zypper --gpg-auto-import-keys refresh` is required after
adding/modifying a repository because `--gpg-auto-import-keys` doesn't
do anything when called with `zypper ar` or `zypper mr`.
Without calling `zypper --gpg-auto-import-keys refresh` here, calling
`zypper ref` after adding/removing would still ask for
accepting/rejecting the gpg key.
2016-05-27 16:17:10 +02:00
Mike Place
d052908729 Merge pull request #33501 from meaksh/zypper-download-check-signature-2015.8
unit tests for rpm.checksum() and zypper.download()
2016-05-26 07:34:27 -07:00
Pablo Suárez Hernández
eaaef25c79 lint issue fixed 2016-05-26 08:26:24 +01:00
Justin Findlay
2781377b17 modules.mac_brew: update unit tests 2016-05-25 22:15:12 -06:00
Justin Findlay
0ed3598fc9 modules.mac_brew int tests: add latest_version test 2016-05-25 22:15:12 -06:00
Justin Findlay
8789c2d06d modules.mac_brew int tests: add list_upgrades,info_installed 2016-05-25 22:05:01 -06:00
Justin Findlay
be381e0fc9 modules.mac_brew int tests: move decorators to class
Also remove unneeded system grains code.
2016-05-25 22:05:01 -06:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3'
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
2016-05-25 13:44:21 -06:00
Mike Place
70eb7b66f3 Merge pull request #33487 from jtand/glance_doc_fixes
Add docstring examples to glance.py and nova.py [2015.8]
2016-05-25 09:47:25 -07:00
Pablo Suárez Hernández
6b6febb211 unit tests for rpm.checksum() and zypper.download() 2016-05-25 17:08:16 +01:00
Blaine Chatman
7599b18995 fix jobs.list_jobs failing with search_target 2016-05-24 17:56:45 -07:00
Justin Anderson
ebf1256545 Don't need to check swift.head due to it having no body 2016-05-24 15:26:28 -06:00
Justin Anderson
59e90064e6 modules.swift.head does not have a body. Should not be checked for a docstring right now. 2016-05-24 14:58:32 -06:00
Mihai Dincă
c8b4f338d8 Make --gpg-auto-import-keys a global param when calling zypper (#33432) 2016-05-23 14:15:29 -07:00
Nicole Thomas
0c4e38ced4 Fix the saltutil.wheel function and add integration tests (#33414)
* Fix the saltutil.wheel function and add integration tests

Fixes #32446

* Provide a more useful message when command is run on non-local minion
2016-05-23 14:11:16 -07:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3'
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
2016-05-19 16:22:36 -06:00
Nicole Thomas
4fdb097c01 Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)
* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location
2016-05-19 09:32:32 -07:00
Nicole Thomas
7a7018261e Server Density agentv2 support (#32772) (#33303)
* Added support for the agentv2

* Updated os field to match the SD API requirement

* filename is an absolute path on official installations

* Install script URL uses a redirect now, so we should instruct curl to follow them

* Added a missing import

* Updated the settings for the v2 agent

* Fixed pep8 issues

* select v2 agent for the test
2016-05-17 09:50:36 -07:00
C. R. Oldham
8387657d9a Prevent salt-cloud from hanging when spinning up new Vultr instances (#33272)
* better support for named images, locations, sizes

* better support for named images, locations, sizes

* Tests for Vultr driver

* Add sleep so test instance will be old enough to delete as part of the test

* Lint.
2016-05-16 13:11:29 -07:00
rallytime
32779b8d71 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/x509.py
2016-05-16 10:47:12 -06:00
Erik Johnson
855bed36c1 Check rendered YAML for invalid keys (#33213)
* Check rendered YAML for invalid keys

PyYAML will for some reason allow improper YAML, specifically double
curly-braces like ``{{ }}``, to be formed into an unhashable dict (that
is, one with a dict as a key). This commit will change the YAML renderer
such that the rendered data is recursively checked for keys that are
dicts, and raises an SaltRenderError if such a key is encountered.

Resolves #33073.

* Fix smtp returner test

This test was using jinja placeholders but was not passing the template
through the jinja renderer. This commit adds the use of the jinja
renderer to this test to fix the failure caused by the addition of
verification of the loaded YAML inthe previous commit.
2016-05-13 09:22:43 -07:00
rallytime
679200aeb2 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/scripts.py
2016-05-12 16:52:27 -06:00
Nicole Thomas
730bec1eef [2015.8] Merge forward from 2015.5 to 2015.8 (#33207)
* Fix file.managed for Windows (#33181)

* Revert back to import string_types

For some reason, there is a problem with the following
code when run from the file.py module:
```
from salt.ext import six
comment = 'This is a string'
isinstance(comment, six.string_types)
```
When run from within the python shell it works fine.

* Add six import

* Fix some lint

* Use correct six import

* Changed it back to explicit import

* Additional comments specific to 2015.5

* Fix file.managed for real

* Move comment to clarify purpose

* update 2015.5.11 release notes (#33197)

* Add pip installed and removed test (#33178)

* Resolve issue with pkg module on Mint Linux (#33205)

Closes #32198
2016-05-12 13:54:47 -07:00
Justin Anderson
a09e1b6335 Add pip installed and removed test (#33178) 2016-05-12 08:31:41 -07:00
rallytime
c6f18fac3f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/minion.py
2016-05-10 15:13:24 -06:00
Mike Place
033bef2ed2 Hash fileclients by opts (#33142)
* Hash fileclients by opts

There was an issue whereby the cache of the fileclient was being overwritten
by dueling minion instances in multimaster mode. This protects them by hashing
by the id of opts.

Closes #25040

* Silly typo!

* Remove tests which do not test any actual functionality or are too tightly coupled to the implementation
2016-05-10 15:04:52 -06:00
rallytime
449176f06e Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-10 11:58:55 -06:00
Justin Anderson
8b1e34fb17 Skipping salt-call --local test 2016-05-10 10:48:18 -06:00
rallytime
92e0c17645 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-05-09 13:55:06 -06:00
rallytime
0fd5e9d157 Merge branch '2015.5' into '2015.8'
Conflits:
  - salt/minion.py
  - tests/integration/states/file.py
2016-05-06 12:04:06 -06:00
Justin Anderson
d4928c5a22 Use saltstack repo in buildpackage.py on CentOS 5 (#33080) 2016-05-06 08:27:31 -07:00
rallytime
180c03ca24 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/states/boto_elb.py
  - tests/integration/states/user.py
  - tests/unit/states/file_test.py
2016-05-06 09:20:05 -06:00
Mike Place
6d604926d3 Merge pull request #33088 from isbm/isbm-zypper-fix-booleans
Bugfix: Restore boolean values from the repo configuration
2016-05-06 08:13:27 -07:00
Megan Wilhite
2c6326f14a fix tests for file.blockplace to remove newline (#33082) 2016-05-06 08:44:20 -06:00
Bo Maryniuk
79a46e091c Add repo config test 2016-05-06 12:57:52 +02:00
Bo Maryniuk
222b8369ca Add test data for repos 2016-05-06 12:57:36 +02:00
Mike Place
fb89877cf2 Merge pull request #32892 from isbm/isbm-zypper-env-variables
Resolve Zypper locks on asynchronous calls
2016-05-05 07:34:59 -07:00
Megan Wilhite
61d126cb98 add test for installing package while using salt-call --local (#33025)
* add test for installing package while using salt-call --local

* fix pylint
2016-05-05 07:17:12 -07:00
Mike Place
e9c94a4141 Skip Unicode test if the system does not have a filesystem encoding set (#33057)
In the case where a user does not have the LANG env set,
Python can't figure out how to encode Unicode during a popen call.

I could not find any combination of tricks, including setting the encoding
or the locale or the environment variable itself in the call to popen that
would mitigate this issue. This may well be a bug in the Python stdlib itself.
2016-05-05 07:06:07 -07:00
Nicole Thomas
111701c8bb [2015.8] Merge forward from 2015.5 to 2015.8 (#33054)
* Add run_on_start docs to schedule.rst (#32958)

Fixes #22580

* Backport #33021 manually to 2015.5 (#33044)

* Saltfile with pillar tests (#33045)

* add file.managed with pillar data tests

* do not require git for other tests

* Whitespace...
2016-05-05 07:05:55 -07:00
Justin Anderson
1066063a19 File and User test fixes for 2015.8 on Fedora23 (#33056)
* Fix failing user present test

* Fix file_test.test_symlink failure on 2015.8
2016-05-05 07:05:10 -07:00
Justin Anderson
6d3e4e8935 File and User test fixes for 2015.5 on Fedora23 (#33055)
* Fix file_test.test_symlink on 2015.5

* Fix failing user present test
2016-05-05 07:00:59 -07:00
Megan Wilhite
d48b2b8b52 test pillar.items output (#33060) 2016-05-05 06:51:27 -07:00
Justin Findlay
a78bbd0544 Update mac_assistive module for El Capitan (10.11) (#33047)
* modules.mac_assistive int tests: wrap args in list

* modules.mac_assistive.install: match schema on El Capitan

* modules.mac_assistive: remove redundant LooseVersion

* modules.mac_assistive unit tests: mock __grains__
2016-05-04 15:34:03 -06:00
Megan Wilhite
f8757631b2 Saltfile with pillar tests (#33045)
* add file.managed with pillar data tests

* do not require git for other tests
2016-05-04 14:37:57 -06:00
Justin Findlay
186352a8b8 fix dimensiondata, gce unit test certs on MacOS (#33020) 2016-05-04 09:09:02 -07:00
Justin Anderson
28ba98c613 Skip some tests related to #32902 (#32995) 2016-05-03 08:55:23 -07:00
rallytime
c12b9a5094 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-05-02 10:50:27 -06:00
Justin Anderson
00fbeaba5f Fix boto_secgroup_test (#32986) 2016-05-02 10:46:19 -06:00
Justin Findlay
cc854f1464 update pip state and integration tests for newer pip versions (#32905)
* modules.virtualenv_mod: use correct pip bootstrap url

* modules.pip: raise error on mirrors arg

* states.pip: run mirrors test on < 7.0.0

* update pip integration test states to not use mirrors

* modules.pip: run mirrors tests on pip < 7.0.0
2016-04-29 10:49:29 -07:00
Megan Wilhite
c57a2b8f3b Fix user present tests (#32895)
* fix user present tests for mac

* add setup and teardown methods

* add destructive and root decorators

* forgot teardown decorators

* fix pylint
2016-04-29 10:40:54 -06:00
Justin Anderson
fa7e32afcc Fixing failures in gce_test and dimensiondata_test (#32921)
* Fixing failures in gce_test and dimensiondata_test

* Fixed lint
2016-04-28 14:15:22 -06:00
Bo Maryniuk
c55b0fab58 Test DOM parsing 2016-04-27 15:43:35 +02:00
Bo Maryniuk
c54e928e4f Add exception handling test 2016-04-27 15:43:17 +02:00
Bo Maryniuk
6a98f523ac Add Zypper caller test suite 2016-04-27 15:21:00 +02:00
Bo Maryniuk
7e1712dd80 Fix tests according to the new calling model 2016-04-27 14:35:22 +02:00
Bo Maryniuk
3a30b7fbcd Remove an obsolete test case 2016-04-27 14:34:54 +02:00
Bo Maryniuk
6e5877a2ee Add Zypper Call mock 2016-04-27 14:34:31 +02:00
Ch3LL
3520d496ba add /Users directory for mac minion in user present test 2016-04-26 15:32:11 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
2016-04-26 12:07:42 -06:00
Nicole Thomas
02c681311f Merge pull request #32844 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-04-26 11:38:08 -06:00
Justin Findlay
5a4398a746 netapi.rest_cherrypy: use unsalted PW on MacOS (#32850) 2016-04-26 11:04:25 -06:00
Nicole Thomas
eb8fb6b9df Back-port #31139 to 2015.8 (#32868)
* Evaluate %h and %u before deciding if the ssh config path is absolute

Since %h is the user's home directory, it's not very useful unless it
appears at the beginning of the path.  However, putting it at the
beginning of the path does not have the expected effect: %h/.ssh
will become /home/someuser/home/someuser/.ssh, since "%h/.ssh" is
identified by Python as a non-absolute path, causing the user's
home directory to be tacked on the front.

* Improved ssh_auth path expansion test
2016-04-26 10:44:01 -06:00
rallytime
1fc9de1d04 Add 'file.source_list' mock to archive state unit tests 2016-04-26 10:39:43 -06:00
Justin Findlay
aac1ae35c5 fix some shell tests for MacOS (#32852)
* auth.pam int test: use unhashed pw for MacOS

* shell tests: strip whitespace from shell return

Similar to 2f1c0cf.

* modules.mac_user.delete: update example for int test

integration.shell.call.CallTest.test_user_delete_kw_output expects this
exact string to be in the doc for user.delete:
```
salt '*' user.delete name remove=True force=True
```
2016-04-26 09:47:35 -06:00
rallytime
9064d3bbfb Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/states/archive.py
2016-04-25 15:45:17 -06:00
Nicole Thomas
f9ffcb697a [2016.3] Merge forward from 2015.8 to 2016.3 (#32784)
* json encode arguments passed to an execution module function call

this fixes problems where you could pass a string to a module function,
which thanks to the yaml decoder which is used when parsing command line
arguments could change its type entirely. for example:

__salt__['test.echo')('{foo: bar}')

the test.echo function just returns the argument it's given. however,
because it's being called through a salt-call process like this:

salt-call --local test.echo {foo: bar}

salt thinks it's yaml and therefore yaml decodes it. the return value
from the test.echo call above is therefore a dict, not a string.

* Prevent crash if pygit2 package is requesting re-compilation of the e… (#32652)

* Prevent crash if pygit2 package is requesting re-compilation of the entire library on production systems (no *devel packages)

* Fix PEP8: move imports to the top of the file

* Move logger up

* Add log error message in case if exception is not an ImportError

* align OS grains from older SLES with current one (#32649)

* Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32640)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch (#32563)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch

Also properly handle comparisions for packages with multiple versions.

Resolves #32229

* Don't attempt downgrade for kernel and its subpackages

Multiple versions are supported since their paths do not conflict.

* Lower log level for pillar cache (#32655)

This shouldn't show up on salt-call runs

* Don't access deprecated Exception.message attribute. (#32556)

* Don't access deprecated Exception.message attribute.

To avoid a deprecation warning message in logs.
There is a new function salt.exceptions.get_error_message(e) instead.

* Fixed module docs test.

* Fix for issue 32523 (#32672)

* Fix routes for redhat < 6

* Handle a couple of arguments better (Azure) (#32683)

* backporting a fix from develop where the use of splay would result in seconds=0 in the schedule.list when there was no seconds specified in the origina schedule

* Handle when beacon not configured and we try to enable/disable them (#32692)

* Handle the situation when the beacon is not configured and we try to disable it

* a couple more missing returns in the enable & disable

* Check dependencies type before appling str operations (#32693)

* Update external auth documentation to list supported matcher. (#32733)

Thanks to #31598, all matchers are supported for eauth configuration.
But we still have no way to use compound matchers in eauth configuration.
Update the documentation to explicitly express this limitation.

* modules.win_dacl: consistent case of dacl constants (#32720)

* Document pillar cache options (#32643)

* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job

* Properly handle minion failback failure. (#32749)

* Properly handle minion failback failure.

Initiate minion restart if all masters down on __master_disconnect like
minion does on the initial master connect on start.

* Fixed unit test

* Improve documentation on pygit2 versions (#32779)

This adds an explanation of the python-cffi dep added in pygit2 0.21.0,
and recommends 0.20.3 for LTS distros. It also links to the salt-pack
issue which tracks the progress of adding pygit2 to our Debian and
Ubuntu repositories.

* Pylint fix
2016-04-25 15:26:09 -06:00
Knut Auvor Grythe
478856815c Support unicode in all GECOS fields on FreeBSD (#32794)
* Support unicode in all GECOS fields on FreeBSD

* Revert erroneous change

* Add unit tests
2016-04-25 15:19:13 -06:00
rallytime
ce72851861 Merge branch '2014.7' into '2015.5'
Conflicts:
  - salt/netapi/rest_tornado/__init__.py
  - salt/netapi/rest_tornado/saltnado.py
2016-04-22 10:24:06 -06:00
Seth House
2775edc176 Saltnado /run fix (#32590)
* Revert "Verify auth in saltnado run (#32552)"

This reverts commit b19c5a5ce7.

* Call runner.cmd_async instead to enforce eauth

* Check for both token or user/pass before giving to Salt

* Remove comment as we're now enforcing auth here

* Lint and functionality fix courtesy of Mike P.

* Don't fail the whole request if there's an eauth problem
2016-04-22 10:10:47 -06:00
Dmitry Kuzmenko
1d6d234417 Properly handle minion failback failure. (#32749)
* Properly handle minion failback failure.

Initiate minion restart if all masters down on __master_disconnect like
minion does on the initial master connect on start.

* Fixed unit test
2016-04-22 09:15:55 -06:00
Erik Johnson
67d0c81184 Support remote sources in a source list (#32691)
* Support remote sources in a source list

This commit modifies the source_list check so that remote sources
(http(s), ftp, etc.) are not fetched more than once. To do so, it
adds the use of ``__context__`` in ``cp.cache_file`` and
``file.source_list`` to prevent multiple fetches of a single file in the
same salt run.

* Update tests

Added __context__ to test cases to reflect usage of __context__, and
also added file.source_list to mocked funcs for archive.extracted unit
test.
2016-04-21 08:37:38 -06:00
Anthony Shaw
1183106e75 Fix line endings 2016-04-20 01:32:49 +10:00
Anthony Shaw
d2abe56a20 Added some unit tests for GCE and Dimension Data modules 2016-04-19 08:18:25 +10:00
Justin Anderson
f6861768f4 Skipping boto test on OpenSuse (#32624) 2016-04-18 09:57:51 -06:00
Knut Auvor Grythe
d432e4b990 Add support for unicode in all GECOS fields (#32630)
* Add support for unicode in all GECOS fields

* Stop exposing sdecode from salt.modules.useradd

* Slight rephrase of comment

* Fix lint errors
2016-04-18 08:56:40 -06:00
Shane Lee
97111bdc9b Fix mac_service and mac_system modules (#32587)
* Fix mac_service module

* Add integration tests for new functions

* Start will not enable the service beforehand

* Remove unused variables
2016-04-15 15:49:44 -06:00
Ronald van Zantvoort
c25dffe7a9 Deprecate 'user' and 'group' in state cmd (#32613)
* Remove unused 'group' argument

* Fix unit testing of cmd.mod_run_check without group arg

* Deprecate 'user/group' in cmd.run

* Deprecate 'user'/'group' in cmd.script

* Deprecate 'user' in cmd.wait

* Deprecate 'user'/'group' in cmd.wait_script

* Fix mod_run_check without 'group'

* Push deprecation back one release
2016-04-15 13:30:56 -06:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
2016-04-13 09:42:54 -06:00
Nicole Thomas
1834bdefe3 Merge pull request #32531 from ticosax/support-no-volumes
[dockerng] Fix support of dockerng.volume_present when no volume is on present.
2016-04-13 08:42:12 -06:00
Nicolas Delaby
5d73d54ed2 Enhance dockerng.wait() to control success on exit_code and on already stopped containers (#32475) 2016-04-13 08:16:26 -06:00
Bo Maryniuk
214f01e963 Bugfix: salt-key crashes if tries to generate keys to the directory w/o write access (#32436)
* Raise an exception if keys are tried to be written to the directory that has no write access permissions

* Show an reasonable error message instead of a traceback crash.

* Fix the unit tests
2016-04-13 08:15:37 -06:00
Nicolas Delaby
958b2ec749 Fix support of dockerng.volume_present when no volume is on present.
fixes #32493
2016-04-13 15:47:13 +02:00
Bo Maryniuk
492ebfc184 Isbm zypper list products sles11 crash (#32505)
* Check for EOL aggregate and fix time_t attribute

* Update SLE11 SP3 data

* Update SLE12 SP1 data

* Adjust test values according to the testing data
2016-04-12 08:14:19 -06:00
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
2016-04-11 14:33:21 -06:00
Neil Williamson
4372dc3816 Automatically detect correct MySQL password column for 5.7 and fix setting passwords (#32440)
* Automatically detect MySQL password column

* Fix changing password in MySQL 5.7

* Fix lint test

* Fix unit tests (?)

They will still fail if "authentication_string" is legitimately the right column name, but I don't know what to do about that.

* Additional unit test fix
2016-04-11 11:07:44 -06:00
Justin Findlay
117d641830 tests.integration: fix 4230c8a 2016-04-08 16:54:00 -06:00
Justin Findlay
fa8d030ab7 tests.integration: bypass MacOS TMPDIR, gettempdir (#32447)
Updates 0edd532, 8f558a5.

When logging in as root over `ssh root@host`, `$TMPDIR` and
`tempfile.gettempdir()` are both set to a variation of:
```
/private/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/
```
When logging in as root over `sudo -i`, `$TMPDIR` is unset and
`tempfile.gettempdir()` is set to `/tmp`.

My guess is that the second case is an unintended or uncorrected omision
by Apple as they have introduced the longer, randomized temp path in a
recent version of MacOS.
2016-04-08 16:00:48 -06:00
Justin Anderson
116c91e293 Changed the target file in file.symlink test (#32443) 2016-04-08 16:00:15 -06:00
Nicole Thomas
8d44aa3f08 Merge pull request #32429 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-04-08 10:56:12 -06:00
rallytime
59b804d230 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/pkgng.py
  - salt/modules/status.py
  - salt/states/boto_asg.py
  - salt/states/boto_elb.py
2016-04-07 16:28:59 -06:00
rallytime
9531ea6ef5 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/topics/highavailability/index.rst
  - salt/loader.py
  - salt/modules/service.py
  - salt/states/cmd.py
  - tests/unit/states/cmd_test.py
2016-04-07 16:10:32 -06:00
Nicole Thomas
0809126d8e Merge #32293 with test fixes (#32418)
* Fix issue #11497

* Remove check for working directory presence in tests
2016-04-07 14:55:25 -06:00
Justin Anderson
6f98bd50eb Update glusterfs_test to be inline with #32312 2016-04-07 14:38:21 -06:00
Justin Anderson
28ea60f28e Fixes test failure where Fedora 23 has /etc/grub.conf by default 2016-04-07 11:40:12 -06:00
Justin Anderson
65614b7f0f Updated salt.spec bash_completion 2016-04-07 09:16:47 -06:00
Bo Maryniuk
0d9a06b8c6 Cleaner deprecation process with decorators
* Add deprecation decorator scaffold

* Capture type error and unhandled exceptions while function calls

* Aware of the current and future version of deprecation

* Implement initially is_deprecated decorator

* Add an alias for the capitalization

* Fix capitalization easier way

* Remove an extra line

* Add successor name to the deprecation decorator.

* Granulate logging and error messages.

* Implement function swapper

* Raise later the caught exception

* Clarify exception message

* Save function original name

* Remove an extra line

* Hide an alternative hidden function name in the error message, preserving the error itself

* Rename variable as private

* Add a method to detect if a function is using its previous version

* Message to the log and/or raise an exception accordingly to the status of used function

* Log an error along with the exception

* Add internal method documentation

* Add documentation and usage process for decorator "is_deprecated"

* Add documentation and process usage for the decorator "with_deprecated"

* Hide private method name

* Fix PEP8, re-word the error message

* Deprecate basic uptime function

* Add initial decorator unit test

* Rename old/new functions, mock versions

* Move frequent data to the test setup

* Add logging on EOL exception

* Rename and document high to low version test on is_deprecated

* Implement a test on low to high version of is_deprecated decorator

* Add a correction to the test description

* Remove a dead code

* Implement a test for high to low version on is_deprecated, using with_successor param

* Correct typso adn mistaeks

* Implement high to low version with successor param on is_deprecated

* Setup a virtual name for the module

* Implement test for with_deprecated should raise an exception if same deprecated function not found

* Implement test for with_deprecated an old function is picked up if configured

* Correct test description purpose

* Implement test with_deprecated when no deprecation is requested

* Add logging test to the configured deprecation request

* Add logging testing when deprecated version wasn't requested

* Implement test EOL for with_deprecated decorator

* Correct test explanation

* Rename the test

* Implement with_deprecated no EOL, deprecated other function name

* Implement with_deprecated, deprecated other function name, EOL reached

* Add test description for the with_deprecated + with_name + EOL

* Fix confusing test names

* Add logging test to the is_deprecated decorator when function as not found.

* Add more test point to each test, remove empty lines

* Bugfix: at certain conditions a wrong alias name is reported to the log

* Fix a typo in a comment

* Add test for the logging

* Disable a pylint: None will _never_ be raised

* Fix test for the deprecated "status.uptime" version

* Bugfix: Do not yank raised exceptions

* Remove unnecessary decorator

* Add test for the new uptime

* Add test for the new uptime fails when /proc/uptime does not exists

* Rename old test case

* Skip test for the UTC time, unless freeze time is used.

* Fix pylint

* Fix documentation

* Bugfix: proxy-pass the docstring of the decorated function

* Lint fix
2016-04-06 12:55:45 -06:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
2016-04-05 15:09:27 -06:00
Erik Johnson
fbbf5935aa Add missing spm manpage and bash_completion file
Also remove duplicate entries for master/minion conf templates
2016-04-04 16:53:56 -05:00
Erik Johnson
80f7c31d53 buildpackage.py: add salt.bash to SOURCES 2016-04-04 16:53:56 -05:00
Erik Johnson
969519b37e Remove unnecessary cd command 2016-04-04 16:53:56 -05:00
Erik Johnson
ead5c3d6bc Fix missing endif 2016-04-04 15:25:46 -05:00
Mike Place
234a5c365c Merge pull request #32283 from jtand/user_preset_test_fix
Changed /tmp/ to /home/ user.present test
2016-04-04 12:02:08 -06:00
Mike Place
95bcdaa4bb Merge pull request #32287 from rallytime/reimplement-31172
Reimplement #31172, which got removed in a merge-forward.
2016-04-04 11:53:11 -06:00
Mike Place
edbab99164 Merge pull request #32295 from rallytime/test-cloud-deploy-dir
Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config
2016-04-04 11:38:47 -06:00
Benjamin Drung
8cada9573f Fix typos of retrieve 2016-04-04 14:27:41 +02:00
Justin Findlay
e7ee59fb6c modules.parallels: add unit tests 2016-04-02 16:42:00 -06:00
Erik Johnson
29723182f9 Update buildpackage spec 2016-04-01 17:57:42 -05:00
rallytime
4037476f40 Patch call to os.path.isdir so we know both search paths are in tuple 2016-04-01 15:13:57 -06:00
rallytime
e195376f61 Patch isdir call and test seach path tuple positions as well 2016-04-01 15:09:57 -06:00
rallytime
b86f6922c4 Print search_paths return for debugging 2016-04-01 13:52:43 -06:00
rallytime
bf48922e7d Add test for 'deploy_scripts_search_path' contents in salt.config.cloud_config 2016-04-01 09:43:30 -06:00
rallytime
49a4eec051 Test the contents of 'deploy_scripts_search_path' in salt.config.cloud_config
Refs #32183
2016-04-01 09:40:58 -06:00
Justin Anderson
c6a1d8b7ba Changed /tmp/ to /home/ user.present test 2016-03-31 15:13:58 -06:00
Erik Johnson
3e374e7ec6 Merge pull request #32243 from isbm/isbm-zypper-list-installed-ensure-latest
Ensure latest pkg.info_installed ensure latest
2016-03-31 11:09:59 -05:00
Mike Place
8ca6bf2177 Merge pull request #32259 from jfindlay/tmpdir
MacOS tmpdir
2016-03-31 08:31:07 -06:00
Justin Findlay
8f558a5f41 tests...runtests_helpers: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:40 -06:00
Justin Findlay
0edd532add tests.integration: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:39 -06:00
Justin Findlay
c74c241831 tests.integration: use os.path.realpath
This reverts bf894c37, 6b99798b, and 4028d80e.  `os.path.realpath`
behaves identically to `salt.utils.abs_readlink` on the doc tests in
that function.
2016-03-30 21:09:39 -06:00
Bo Maryniuk
73ad8a2bfc Fix lint 2016-03-31 01:55:38 +02:00
twangboy
5ca4ad6675 Fix unit tests for state 2016-03-30 17:12:12 -06:00
rallytime
ea3d21d126 Fix failing test 2016-03-30 16:53:42 -06:00
twangboy
b26cb76abb Fix unit tests 2016-03-30 16:51:58 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 15:33:13 -06:00
rallytime
d743f8cc4e Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/modules/aptpkg.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 13:38:38 -06:00
Mike Place
4a5d1b1dd3 Merge pull request #31768 from twangboy/mac_xattr_int
Integration Tests for mac_xattr.py
2016-03-30 13:03:25 -06:00
Mike Place
2816982178 Merge pull request #31959 from twangboy/mac_timezone_int
Integration tests for mac_timezone.py
2016-03-30 13:03:15 -06:00
Mike Place
50e34574d7 Merge pull request #31840 from twangboy/mac_shadow_int
Integration tests for mac_shadow
2016-03-30 13:02:44 -06:00
twangboy
dfe148934b Fix typo 2016-03-30 12:56:39 -06:00
twangboy
a45d2270df Remove test for _convert_to_datetime 2016-03-30 12:56:39 -06:00
twangboy
845809139c Add test for _convert_to_datetime 2016-03-30 12:56:39 -06:00
twangboy
3a6ad91509 Fix some pylint errors 2016-03-30 12:56:39 -06:00
twangboy
f1a5134b92 Total rewrite of mac_shadow.py
Updated mac_shadow integration tests
2016-03-30 12:56:39 -06:00
twangboy
c62920fb08 Add destructiveTest decorators 2016-03-30 12:56:39 -06:00
twangboy
9fe91a8fb5 Fix __random_string assignment 2016-03-30 12:56:39 -06:00
twangboy
1da27172b9 Add integration tests for mac_shadow 2016-03-30 12:56:39 -06:00
Mike Place
5d08db7c92 Merge pull request #32162 from terminalmage/issue31963
Properly handle yum/zypper repositories in pkgrepo.managed
2016-03-30 11:51:05 -06:00
Mike Place
231da529e0 Merge pull request #32224 from Ch3LL/add_grains_match_test
Add grains match with wildcard tests
2016-03-30 11:30:42 -06:00
Erik Johnson
5c1bdb812c Fix pkgrepo integration test
Also re-enabled test on ubuntu 15.10.
2016-03-30 11:34:55 -05:00
Ch3LL
665468b5e8 fix pylint 2016-03-30 10:28:48 -06:00
Bo Maryniuk
f07c7ea792 Add lowpkg tests for version comparison 2016-03-30 17:33:24 +02:00
Bo Maryniuk
afdf451d87 Remove tests from the zypper_test that belongs to rpm_test 2016-03-30 17:33:03 +02:00
twangboy
66afd4855c Fix unit tests 2016-03-30 08:56:49 -06:00
twangboy
93f252d868 Fix some pylint errors 2016-03-30 08:56:49 -06:00
twangboy
f5f7249c37 Fix unit tests 2016-03-30 08:56:49 -06:00
twangboy
8ea709cc3f Remove xattr.list from know_to_return_none 2016-03-30 08:56:49 -06:00
twangboy
cedc14e6f5 Fix tests for read and delete 2016-03-30 08:56:49 -06:00
twangboy
cbd868e12a Improve integration tests 2016-03-30 08:56:49 -06:00
twangboy
1934a17f8e Add additional error handling 2016-03-30 08:56:49 -06:00
twangboy
833d63c27d Raise errors on command failures 2016-03-30 08:56:49 -06:00
twangboy
6f98a5204f Fix xattr.list returning None
Fixes tests
Removes super calls from setUp and tearDown
2016-03-30 08:56:49 -06:00
twangboy
bacaa9c4c0 Add missing import 2016-03-30 08:56:49 -06:00
twangboy
1094754085 Gate the tests for Mac OS X 2016-03-30 08:56:49 -06:00
twangboy
ab205f52d4 Fix some lint errors 2016-03-30 08:56:49 -06:00
twangboy
cd4c84a7eb Fix problem with xattr.list tests 2016-03-30 08:56:49 -06:00
twangboy
f54139fb9f Fix some tests 2016-03-30 08:56:49 -06:00
twangboy
fd96733fc7 Put test file in correct state for each test 2016-03-30 08:56:49 -06:00
twangboy
212590b130 Add remaining test functions 2016-03-30 08:56:49 -06:00
twangboy
8b8d35ef8b Add if main statement 2016-03-30 08:56:49 -06:00
twangboy
677c4384b0 Add integration test file for mac_xattr 2016-03-30 08:56:49 -06:00
twangboy
3c1c076d78 Fix unit tests 2016-03-30 08:46:02 -06:00
twangboy
fedc5c367c Use class attributes instead of global variables 2016-03-30 08:46:02 -06:00
twangboy
54059b33a0 Add global variables for setUp function 2016-03-30 08:46:02 -06:00
twangboy
fb82553be7 Add instructions for parallels time sync
Re-added tests that were having problems caused
by parallels time sync
2016-03-30 08:46:02 -06:00
twangboy
19ec1ea837 Fix some tests 2016-03-30 08:46:02 -06:00
twangboy
4e89f8f124 Fix tests 2016-03-30 08:46:02 -06:00
twangboy
1050dbe6ec Simplified tests 2016-03-30 08:46:02 -06:00