valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
54,328 Commits 24 Branches 182 Tags 341 MiB
de7fe49830
Commit Graph

54328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Steed
de7fe49830 py3: fix tests/unit/modules/virt_test.py 
In libvirt_domain.jinja, use disk.items() instead of the py2-only
iteritems(). The number of disks should be small enough for this not to
matter.

in virt_test.py, don't rely on the py2 behavior of str/int comparison,
and don't rely on dict.keys() being indexable.
 2015-06-09 13:06:44 -06:00
Michael Steed
aec070d41f py3: fix salt/modules/slack_notify.py 
Use six-wrapped urlencode
 2015-06-09 10:32:39 -06:00
Michael Steed
cb2985732d py3: fix salt/crypt.py 
- Open key files in binary mode since the PyCrypto key import/export
  routines use bytes
- Add unit tests for the easy stuff not covered elsewhere
 2015-06-09 10:19:06 -06:00
Thomas S Hatch
2418b1ee93 Merge pull request #24492 from DSRCompany/keep_grains_in_opts 
Don't remove grains from opts
 2015-06-09 09:11:25 -06:00
Thomas S Hatch
06279dd9b0 Merge pull request #24514 from msteed/py3-unittests-3 
More py3 unittest fixes
 2015-06-09 09:10:35 -06:00
Nicole Thomas
88d2eeca00 Merge pull request #24518 from rallytime/merge-24448 
Merge #24448 with Pylint Fixes
 2015-06-08 23:48:14 -06:00
Nicole Thomas
de8a08bbc0 Merge pull request #24356 from kev009/cmdmod-notimeout 
ignore_timeout on cmd.run/watch
 2015-06-08 22:40:09 -06:00
rallytime
28af2bfe2b Pylint fix 2015-06-08 22:31:44 -06:00
Nicole Thomas
87e1c6008c Merge pull request #24459 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-08 22:27:08 -06:00
Nicole Thomas
cadba530f1 Merge pull request #24509 from jdsieci/develop 
BugFix in new RH route template
 2015-06-08 22:02:36 -06:00
Nicole Thomas
274815b00b Merge pull request #24505 from UtahDave/develop 
Add missing string formatting
 2015-06-08 21:57:49 -06:00
Nicole Thomas
18a09f4e61 Merge pull request #24503 from garethgreenaway/refactor_random_salt_utils_http 
Fixes to random_org.py
 2015-06-08 21:56:53 -06:00
Nicole Thomas
ad02a04834 Merge pull request #24489 from nmadhok/patch-cloud 
If deploying salt on windows VM, 'win_password' may be specified instead of 'password'
 2015-06-08 21:39:45 -06:00
Colton Myers
49819f347b Merge pull request #18 from joejulian/fix_tls_tests_for_forward_merge 
Fix tls tests for forward merge
 2015-06-08 18:42:52 -06:00
Joe Julian
4a840f39d5 Fix tls test to work against develop branch 2015-06-08 17:36:29 -07:00
Joe Julian
81c242d720 Fix incorrect path printing 2015-06-08 17:36:13 -07:00
Joe Julian
048713747c Revert "Disable tls tests (for now)" 
This reverts commit 5833a0e535.
 2015-06-08 16:29:23 -07:00
Michael Steed
f99fa67fdb Update docstring on mac_str_to_bytes() 2015-06-08 16:25:46 -06:00
Michael Steed
cb83dbf87e py3: fix tests/unit/modules/pkg_resource_test.py 
Mock the correct next()
 2015-06-08 16:18:00 -06:00
Michael Steed
03ba3c4b1d py3: fix tests/unit/modules/network_test.py 
Mock whichever ipaddress modules was imported by the network module
 2015-06-08 16:16:52 -06:00
Michael Steed
cc1a6ac697 py3: fix salt/utils/http.py 
Pass str as required by json.loads()
 2015-06-08 16:15:44 -06:00
Michael Steed
cded6bfc70 py3: fix salt/modules/rh_ip.py and tests 
- use six-wrapped StringIO
- fix int/str comparison
 2015-06-08 16:14:35 -06:00
Michael Steed
73bae6d195 py3: fix salt/modules/random_org.py 
Don't rely on python 2 behavior when comparing string and numeric types
 2015-06-08 16:12:53 -06:00
Michael Steed
980e799122 py3: fix salt/modules/postgres.py and tests 
- In db_create(), use an OrderedDict for options. This probably doesn't
  matter in production, but a deterministic order makes the unit test
  work across python 2 and 3.
- Use six-abstracted StringIO
- Use 0 instead of None as the expected successful return code
- Pass bytes instead of str to hashlib.md5()
 2015-06-08 16:08:10 -06:00
Michael Steed
b2b3511864 py3: fix salt/modules/pecl.py 
Correctly handle multiple modules passed to install/uninstall. This case
was already covered by unit tests but was probably failing silently
under python 2.
 2015-06-08 16:06:10 -06:00
Michael Steed
f163e50368 py3: fix salt/modules/network.py and friends 
- dry: move mac address string-to-bytes conversion into a single routine
- add unit tests for said conversion routine
 2015-06-08 16:03:19 -06:00
Michael Steed
24626b7aec py3: fix salt/modules/linux_sysctl.py 2015-06-08 15:59:05 -06:00
Thomas S Hatch
4c8e8a4ce9 Merge pull request #24500 from msteed/py3-unittests-2 
Continued unit test py3 compat
 2015-06-08 15:52:21 -06:00
Colton Myers
5833a0e535 Disable tls tests (for now) 2015-06-08 15:27:47 -06:00
David Boucha
79b688837a Add missing string formatting 2015-06-08 15:12:15 -06:00
David Boucha
c7bf4e1273 Merge pull request #24508 from skizunov/develop2 
On Windows, use win32api.GetUserName instead of getpass.getuser
 2015-06-08 15:11:36 -06:00
Jerzy Drozdz
fbb6f88b28 Merge remote-tracking branch 'upstream/develop' into develop 2015-06-08 22:15:40 +02:00
Jerzy Drozdz
3fac7cdb64 Bugfix in template. Missing endif block 2015-06-08 22:14:21 +02:00
Thomas S Hatch
8b2a0e1b99 Merge pull request #24507 from makinacorpus/dcktypo 
fix dockerng reference -ng -> ng
 2015-06-08 14:09:40 -06:00
Sergey Kizunov
2c5d302f38 On Windows, use win32api.GetUserName instead of getpass.getuser 
getpass.getuser() should not be used for authentication because a
malicious user may simply change an environment variable (eg LOGNAME)
and impersonate any user. Due to this, use win32api.GetUserName()
which is a more secure way of obtaining the user name on Windows.

'pwd' was imported twice. Removed one instance. Use 'HAS_PWD' as
the presence check.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-06-08 13:56:03 -05:00
Mathieu Le Marec - Pasquet
8fdc9ac025 fix dockerng reference -ng -> ng 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-06-08 19:34:38 +02:00
rallytime
c56631b5bb Added "CLI Example" to make failing test happy on develop 2015-06-08 10:42:02 -06:00
Nicole Thomas
a10c11ec38 Merge pull request #24499 from rallytime/fix_doc_failure_develop 
Added "CLI Example" to make failing test happy on develop
 2015-06-08 10:24:21 -06:00
Gareth J. Greenaway
571e26e1a0 missing import for salt.utils.http 2015-06-08 08:31:03 -07:00
Thomas S Hatch
6c4cef2324 Merge pull request #24478 from nmadhok/vmware-cloud-driver 
Vmware cloud driver additions and refactors
 2015-06-08 09:27:37 -06:00
Thomas S Hatch
49584e70c0 Merge pull request #24470 from garethgreenaway/refactor_consul_salt_utils_http 
Updating consul module to use salt.utils.http instead of requests.
 2015-06-08 09:26:29 -06:00
Thomas S Hatch
b351af042d Merge pull request #24450 from ruzarowski/develop 
Fix salt cli runs with batch-size set
 2015-06-08 09:24:28 -06:00
Gareth J. Greenaway
66e09b1437 Missing import for salt.utils.http 2015-06-08 08:16:25 -07:00
Michael Steed
911b39ffd6 fix deprecation warnings shown during unit tests 
log.warn() -> log.warning()
 2015-06-08 08:49:24 -06:00
Michael Steed
97be5d7551 py3: fix tests/unit/modules/ini_manage_test.py 2015-06-08 08:49:14 -06:00
Michael Steed
bd8538db97 py3: fix salt/modules/file.py and unit tests 
Most of the routines in the file execution module that operate on file
contents assume that they are dealing with text files (line-oriented
operations, regular expressions, etc). The exceptions are get_sum(),
get_hash(), and check_hash(). Outside of these three routines, files are
now opened in text mode.
 2015-06-08 08:49:09 -06:00
Michael Steed
12be97ab47 py3: fix salt/modules/debian_ip.py 2015-06-08 08:49:01 -06:00
Michael Steed
3c5e82e878 py3: fix tests/unit/modules/deb_apache_test.py 2015-06-08 08:48:55 -06:00
Michael Steed
a4c8e3172d py3: fix salt/utils/rsax931.py and tests 2015-06-08 08:48:48 -06:00
Michael Steed
4bad02e1f7 py3: use salt.ext.six.moves.urllib instead of urllib2 2015-06-08 08:48:42 -06:00