Commit Graph

19304 Commits

Author SHA1 Message Date
Erik Johnson
7984a8c2cf Apparently the test framework doesn't like private member functions 2013-10-20 21:46:06 -05:00
Erik Johnson
81434578fc Fix function name 2013-10-20 21:29:36 -05:00
Erik Johnson
74ce0cb604 Add CLI example for ports.list_all 2013-10-20 21:09:58 -05:00
Erik Johnson
1c0d279c59 Fix import error 2013-10-20 20:50:28 -05:00
Erik Johnson
9397840021 More tweaks to package tests
This makes package tests work better on CentOS 5, and also adds a 32-bit
target for Ubuntu.
2013-10-20 20:27:45 -05:00
Erik Johnson
90d6d045f1 Move _wait_for_pkgdb_unlock inside of PkgTest class 2013-10-20 18:48:01 -05:00
Erik Johnson
63ee0f1e83 Add function to wait for pkgdb lock to clear
Arch pkg tests that call pkg.latest_version seem to fail on running
this function due to the package database still being locked from
previous tests. This adds a function that waits (in 5 second increments)
for up to 60 seconds for the pkgdb to be unlocked.

http://jenkins.saltstack.com/job/salt-rs-arch/474/artifact/salt-runtests.log/*view*/
2013-10-20 18:18:35 -05:00
Erik Johnson
c5f5b400e9 adjust redhat pkg targets for pkg tests 2013-10-20 17:04:27 -05:00
Erik Johnson
62a9385ddf Don't perform version spec pkg tests on FreeBSD
pkg_add does not support this, so this test will fail when
pkg.latest_version is run and an assertion is done to determine the
targeted version.
2013-10-20 16:00:14 -05:00
Erik Johnson
d5120f1041 Fix generic exception:
Use "except Exception" instead of simply "except". Fixes pylint
violation (see below link for details).

http://jenkins.saltstack.com/job/salt-lint/644/violations/file/salt/utils/parsers.py/
2013-10-20 15:53:24 -05:00
Erik Johnson
5dc08d552a adjust pkg targets for pkg tests 2013-10-20 15:48:57 -05:00
Erik Johnson
fe1c4487e3 add tests for installing 32-bit packages 2013-10-20 15:16:36 -05:00
Erik Johnson
c7fcc79747 Add tests for pkg.installed with version specification 2013-10-20 14:35:10 -05:00
Pedro Algarvio
34d43c510f Merge pull request #7969 from cachedout/#6538
Make an effort to return a warning message if we get arguments passed to...
2013-10-20 09:37:22 -07:00
Thomas S Hatch
e6da57906a whitespace fix per pylint 2013-10-20 06:54:18 -06:00
Thomas S Hatch
b3981a8264 Merge pull request #7988 from makinacorpus/issue-7987
Pr for #7987
2013-10-20 05:43:36 -07:00
Mathieu Le Marec - Pasquet
9ba86c7b90 Fix(fileclient): friendly renegotiate authentication
In case of authentication error, try to renegotiate the crypticle
handshake to mitigate master restart

This fixes #7987
2013-10-20 13:47:54 +02:00
Joseph Hall
045c241459 Merge pull request #7985 from kula/yaml-long-keys
Document how to handle long SSH keys being used as YAML keys
2013-10-19 19:28:08 -07:00
Thomas L. Kula
ba61a2d00a Document how to handle long SSH keys being used as YAML keys
The YAML specification limits simple keys to being 1024 characters
in length. Since SSH keys are often longer than that, and since
the documentation provides examples using the SSH key as a YAML
key, demonstrate the proper way of specifying an YAML 'explicit'
key.
2013-10-19 21:47:35 -04:00
Erik Johnson
9d75d7a425 Change packages for pkg.installed tests on Debian-based systems
Travis-CI uses Debian/Ubuntu VMs and bzr is on their base image, so this
causes these tests to fail on Travis. This replaces bzr for tests on
Debian-based OSes.
2013-10-19 10:48:10 -05:00
Thomas S Hatch
3d3a13050a Merge pull request #7982 from terminalmage/jenkins
Fix jenkins failures
2013-10-19 08:22:08 -07:00
Erik Johnson
d8079775b4 Fix jenkins failures
Mostly whitespace fixes, mixing of tabs and spaces, but also there was a
function call not closed off with a trailing parenthesis.

See http://jenkins.saltstack.com/job/salt-lint/636/violations/ for more
info.
2013-10-19 10:18:28 -05:00
Pedro Algarvio
df60fa5ffe Merge pull request #7981 from terminalmage/tests
Add pkg.installed tests
2013-10-19 07:59:13 -07:00
Erik Johnson
0205f28e4a Add pkg.installed tests 2013-10-19 09:50:48 -05:00
Thomas S Hatch
fc3a849df7 Merge pull request #7980 from olenz/develop
Reduced the output of the state pkg.latest.
2013-10-19 07:48:53 -07:00
Thomas S Hatch
427a5ec4f0 Merge pull request #7975 from c-cooperjones/patch-3
Allow iptables rules to be saved from state iptables.append.
2013-10-19 07:41:58 -07:00
Thomas S Hatch
63ae1efc63 Merge pull request #7973 from UtahDave/fix_win_recurse
Pipes are illegal in Windows paths and filenames
2013-10-19 07:41:29 -07:00
Thomas S Hatch
5ef6b1078f Merge pull request #7972 from cloudflare/pass-data-to-minion-in-caller
Pass data to minion when using salt-call
2013-10-19 07:40:57 -07:00
Olaf Lenz
838490f2da Reduced the output of the state pkg.latest. 2013-10-19 15:19:46 +02:00
c-cooperjones
01b0a67c12 added save kwarg to ignore list for build_rule 2013-10-19 02:43:49 +01:00
c-cooperjones
c838fbcd9f Allow iptables rules to be saved from state iptables.append. 2013-10-19 02:41:05 +01:00
Erik Johnson
01050040ef Merge pull request #7974 from rgbkrk/patch-2
s/wether/whether/
2013-10-18 18:36:09 -07:00
Kyle Kelley
5a75b0cc96 s/wether/whether/ 2013-10-18 20:34:56 -05:00
Erik Johnson
925d6aba7c augeas is not a pkg provider 2013-10-18 20:17:42 -05:00
David Boucha
09b5c3e8f6 Pipes are illegal in Windows paths and filenames 2013-10-18 17:39:33 -06:00
Sebastien Pahl
fe569e07c4 Pass data to minion when using salt-call (otherwise it ends up without a jid) 2013-10-18 15:23:29 -07:00
Thomas S Hatch
26178f629b Merge pull request #7968 from c-cooperjones/patch-2
Added iptables.check for iptables running on redhat/centos
2013-10-18 14:58:58 -07:00
Thomas S Hatch
5c1c0ee250 Merge pull request #7970 from basepi/gitfs
Don't assume the fileserver cache dir has been created
2013-10-18 14:58:39 -07:00
Colton Myers
94f9ce7713 Don't assume the fileserver cache dir has been created 2013-10-18 15:49:13 -06:00
c-cooperjones
58fd1b5594 Added iptables.check for iptables running on redhat/centos
Added if statement based on grain into iptables.check, and changed how build rule is formatted to make it compatible with the check.
2013-10-18 22:25:37 +01:00
Thomas S Hatch
1f29102746 Merge pull request #7965 from cachedout/develop
Doc cleanup
2013-10-18 14:05:19 -07:00
Thomas S Hatch
fe0df6da3b Merge pull request #7966 from cro/develop
Make sure multiple names retain original order
2013-10-18 14:03:12 -07:00
C. R. Oldham
66e3be46d1 Make sure multiple names clauses retain same order 2013-10-18 14:57:48 -06:00
Thomas S Hatch
241883aad3 Doh! from the state object, the compiler is in the state object 2013-10-18 14:49:11 -06:00
Mike Place
2d37f86a99 Make an effort to return a warning message if we get arguments passed to us that even Python's optparse can't deal with. Refs #6538. 2013-10-18 14:03:21 -06:00
Thomas S Hatch
7616152734 strip out unused arg, fix #7964 2013-10-18 13:58:30 -06:00
Joseph Hall
53d8abb358 Merge pull request #7962 from hulu/release-notes-copyedit
copyedit 0.17.1 release notes
2013-10-18 12:56:51 -07:00
Chris Rebert
4253901ce7 copyedit 0.17.1 release notes 2013-10-18 12:55:49 -07:00
Thomas S Hatch
e5f152cba3 fix pylint errors 2013-10-18 13:49:01 -06:00
Colton Myers
09a4cbe252 Merge pull request #7953 from cloudflare/fix-ext_job_cache-minion-keyerror
Fix KeyError on minion startup if ext_job_cache option does not exist
2013-10-18 12:48:50 -07:00