Commit Graph

77 Commits

Author SHA1 Message Date
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
Nicole Thomas
457d9dd4f5 [develop] Merge forward from 2016.3 to develop (#33193)
* 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

* Fix minor document error of test.assertion (#33067)

* test pillar.items output (#33060)

* File and User test fixes for 2015.5 on Fedora23 (#33055)

* Fix file_test.test_symlink on 2015.5

* Fix failing user present test

* add test for installing package while using salt-call --local (#33025)

* add test for installing package while using salt-call --local

* fix pylint

* ssh docs: install py-2.6 for RHEL 5

* Bugfix: Restore boolean values from the repo configuration

* Add test data for repos

* Add repo config test

* Bugfix (follow-up): setting priority requires non-positive integer

* modules.npm: do not log npm --version at info level (#33084)

* salt-cloud: fix ipv6-only virtual machines (#32865)

* salt-cloud: fix ipv6-only virtual machines

* fix hostname for rsync fallback in scp_file function

* use 4 spaces instead of 2

* remove global variable, use direct socket call instead

* Use saltstack repo in buildpackage.py on CentOS 5 (#33080)

* Lower display of msgpack failure msg to debug (#33078)

Closes #33074

* cloud.query needs to define mapper.opts (#33098)

* clarify docs that map is designed to be run once. is not stateful (#33102)

* Moved _finger_fail method to parent class.

Method _finger_fail method from SAuth to AsyncAuth class to make method available
in both class and fix an issue where _finger_Fail is called inside AsyncAuth.

* Fix 33058 (#33099)

* Fix servermanager module

- Added check for 2008 version of windows
- Added Import-Module ServerManager to _pshell_json.
  Apparently this needs to run each time we issue a
  servermanager command.

* Fix list_available

* salt.utils.gitfs: fix formatting for warning messages (#33064)

* salt.utils.gitfs: fix formatting for warning messages

When git_pillar support was added to salt.utils.gitfs, the
recommendation globals had string formatting placeholders added to them,
but the locations where these values are referenced do not call
``.format()`` to properly replace them. This commit fixes that
oversight.

* Remove more gitfs and master-specific wording from log messages

* Add a check that the cmdline of the found proc matches (#33129)

* Doc mock decorators (#33132)

* Add mock function for mocking decorators

* Mock the stdlib user module because importing it will open the repl

* Fix broken parsing of usermgmt.conf on OpenBSD (#33135)

When creating a new user, if a group of the same name already exists,
the usermgmt.conf file is consulted to determine the primary group.
It's in these cases that the parsing bug is triggered.

This code change addresses several of the existing issues:

- The previous split statement explicitly specified a single space.
  Since a config line may have any number of spaces and/or tabs
  surrounding the entries, the resulting array's elements may be
  incorrect.

- According to the man pages for usermgmt.conf, the "group" config
  entry accpets a single parameter -- so we shouldn't iterate.

- The "val[1]" was returning the 2nd letter of each word and not the
  second word on the config line as intended.

* Move salt-ssh thin dir location to /var/tmp (#33130)

* Move salt-ssh thin dir location to /var/tmp

Closes #32771

* Remove performance penelty language

* If cache_jobs: True is set, populate the local job cache when running salt-call (#33100)

* If cache_jobs: True is set, populate the local job cache

Fixes #32834

Allows a masterless minion to query the job cache.

* Refactor cache_jobs functionality to be DRY

* Skipping salt-call --local test

* Back-port #31769 to 2015.8 (#33139)

* Handle empty acl_name in linux_acl state

Calls to setfacl interpret an empty group or user name to mean to be the
owner of the file they're operating on. For example, for a directory
owned by group 'admin', the ACL 'default:group::rwx' is equivalent to
'default:group:admin:rwx'.

The output of the getfacl execution module returns ACLs in the format of
'group:admin:rwx' instead of 'group::rwx'. This commit changes the
acl.present state to look for the owner of the file if the acl_name
paremeter is empty.

* Fix acl.present/acl.absent changing default ACLs

The behaviour of the acl.present and acl.absent is to check the data
structure returned by getfacl contains a key by the name of acl_type.

However, this data structure does not contain any default ACLs if none
exist, so this check will fail. We omit the check if a default ACL was
passed into the state functions.

Unfortunately, the call to modfacl may fail if the user passes in an
acl_type such as 'default:random'. In this case the state will appear to
succeed, but do nothing.

This fixes the state module to allow setting default ACLs on files which
have none.

* Fix regression in 2016.3 HEAD when version is specified (#33146)

Resolves #33013.

* 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

* Strip ldap fqdn (#33127)

* Add option to strip off domain names on computer names that come from LDAP/AD

* Add strip_domains option for ldap.

* Add documentation for auth.ldap.minion_stripdomains.

* [2015.5] Update to latest bootstrap script v2016.05.10 (#33155)

* [2015.8] Update to latest bootstrap script v2016.05.10 (#33156)

* [2016.3] Update to latest bootstrap script v2016.05.10 (#33157)

* add 2015.5.11 release notes (#33160)

* add 2015.8.9 release notes (#33161)

* Pip fix (#33180)

* fix pip!!

* make it work with old pip as well

* Added resiliency

* Don't need to check, just get the right name

* [2015.5] Update to latest bootstrap script v2016.05.11 (#33185)
2016-05-12 07:53:39 -07:00
Colton Myers
efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/vmware.py
    salt/grains/chronos.py
    salt/grains/marathon.py
    salt/loader.py
    salt/modules/chronos.py
    salt/modules/marathon.py
    salt/proxy/chronos.py
    salt/proxy/marathon.py
    salt/state.py
    salt/states/chronos_job.py
    salt/states/marathon_app.py
    salt/states/user.py
    salt/utils/schedule.py
2015-11-13 15:18:45 -07:00
Mike Place
785bf94f55 Add transport setting to shell test 2015-11-12 14:32:39 -07:00
Thayne Harbaugh
3bedbb713b Use "test.versions" instead of "-g" (pid in grains changes).
integration.shell.call.test_issue_15074_output_file_append test just needs any
output that is repeatable.  Previously it used the grains output ("-g"
argument).  Unfortunately grains now includes the PID which changes for each
invocation of "salt-call" and is therefore not predictably comparable.  Use
"test.versions" that should have constant output across multiple invocations.
2015-11-03 14:10:37 -07:00
Pedro Algarvio
e7681f7c75 Try to overcome a failure to get cwd in Cent tests 2015-07-28 12:07:04 +01:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
2015-05-29 15:10:13 -06:00
Justin Findlay
6b6280442c disable intermittently failing tests
This commit is to be reverted when #23623 is merged.
2015-05-28 16:23:57 -06:00
Colton Myers
5b6d410119 Fix calltest 2015-04-11 15:59:06 -04:00
Colton Myers
99744b9568 Fix lint 2015-04-11 15:56:09 -04:00
Colton Myers
cc8785e980 Fix the test.fib tests 2015-04-11 14:48:59 -04:00
Pedro Algarvio
b555ddf658 Py3 compatibility fixes 2015-01-30 22:25:09 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Pedro Algarvio
9d0fe5b1d1 Merge branch '2014.7' into 2015.2
Conflicts:
	salt/modules/brew.py
	tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
Mike Place
7d4123c6b3 Async flag and test cleanup 2015-01-09 21:21:50 -07:00
Mike Place
9d7990f264 Async flag and test cleanup 2015-01-09 13:14:33 -07:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
2014-11-27 03:59:40 +00:00
Pedro Algarvio
1857a0d31f Switch open() for salt.utils.fopen() 2014-11-26 23:30:18 +00:00
Pedro Algarvio
47edf6fc89 Fix the with context 2014-11-26 20:49:04 +00:00
Pedro Algarvio
bfe99dbb3f Merge branch '2014.7' into develop
Conflicts:
	salt/cloud/__init__.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runners/lxc.py
	salt/runners/manage.py
2014-11-26 20:14:56 +00:00
Pedro Algarvio
753338e078 Switch open() for salt.utils.fopen() 2014-11-26 17:49:27 +00:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
2014-10-19 18:21:19 +01:00
Seth House
c6cb642f36 Added integration tests for the --out-indent flag for JSON output 2014-10-16 20:46:34 -05:00
Thomas S Hatch
1f5da204a9 Fix lint 2014-10-15 16:56:41 -06:00
C. R. Oldham
d07ebe2105 Test for retcode 2014-10-14 13:28:19 -06:00
rallytime
2c513cf2bb Remove print from tests 2014-10-09 10:33:34 -06:00
Pedro Algarvio
de520f4766 Revert "Fix broken test on 2014.7" since it runs properly on develop
This reverts commit 9c682933d4.
2014-09-23 19:52:48 +01:00
Colton Myers
3db44821e4 Merge branch '2014.7' into develop
Conflicts:
	salt/config.py
2014-09-23 12:43:47 -06:00
rallytime
9c682933d4 Fix broken test on 2014.7 2014-09-22 12:13:10 -06:00
Pedro Algarvio
aed0178072 Correct --output-file-append test 2014-09-19 10:33:38 -06:00
Pedro Algarvio
8e3f9963cb Correct --output-file-append test 2014-09-17 19:40:58 +01:00
rallytime
064868b87a Fix test failures on develop 2014-09-16 12:23:06 -06:00
Colton Myers
916141fac0 Merge branch '2014.7' into develop
Conflicts:
	tests/integration/shell/call.py
2014-08-20 14:39:31 -06:00
Pedro Algarvio
bf406bf459 Add test case for --output-file-append 2014-08-20 02:42:29 +01:00
Pedro Algarvio
b6e259c21e Add test case for output file permissions
Refs #14979
2014-08-20 02:28:13 +01:00
Mike Place
51e3089a7c Fix broken test. 2014-07-02 14:40:08 -06:00
Aditya Kulkarni
b991977e69 Update expected message 2014-06-26 12:58:49 -04:00
Aditya Kulkarni
54110a9658 Fix paths 2014-06-26 10:18:58 -04:00
Nitin Madhok
6773a34c1f Fixing pylint violations 2014-06-25 19:27:16 -04:00
Aditya Kulkarni
55c92b4eeb Move master top file before test 2014-06-25 16:50:17 -04:00
Pedro Algarvio
d69bb5dfd9 No hard coded configuration paths 2014-06-05 10:10:56 +01:00
Pedro Algarvio
36ea569d0d Don't use hard coded paths 2014-06-05 10:10:55 +01:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Pedro Algarvio
13106807b1 Better examples on tests 2014-04-24 16:04:51 +01:00
Pedro Algarvio
f3fa2aef74 Handle too many arguments for docs in salt-call. Refs #12261. 2014-04-24 15:56:58 +01:00
Thomas Jackson
df4dd4ec18 Fix failing shell test case-- and change up jobs runner to use the "output" config instead of hard coding what the option should be. In addition i changed the display_output function to default the "out" to None, since that means "use config" down inside. 2014-04-19 13:33:25 -07:00
Mathieu Le Marec - Pasquet
537f96fe14 salt-call now returns jobs to master
This is related to #10500.

This finishes @thatch45 work
2014-02-20 20:31:40 +01:00
Pedro Algarvio
a5f2286960 Fix unit test expected results since we now exit with an error code. 2014-01-19 16:16:49 +00:00
Pedro Algarvio
c849c4b57f Moved test cases from #8195 to a better place. 2013-10-31 18:54:25 +00:00
regilero
089787cead Integration tests for #8174, #7905 & #8114: sls syntax errors 2013-10-31 14:30:25 +01:00