valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,627 Commits 24 Branches 182 Tags 341 MiB
3d245bbe84
Commit Graph

1658 Commits

Author SHA1 Message Date
Colton Myers
c3a6280f8c Merge pull request #26617 from terminalmage/issue9592 
Fix Windows failures in pip module due to raw string formatting
 2015-08-27 13:24:53 -06:00
Gareth J. Greenaway
c11cf22abe fixing ipset unit tests based on changes. Adding additional tests for when ip set type is hash:net 2015-08-27 08:28:23 -07:00
Colton Myers
64cad371f0 Remove overmocked test 2015-08-26 16:02:42 -06:00
Colton Myers
ed940ad5f5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/openstack.py
    tests/unit/modules/artifactory_test.py
    tests/unit/modules/groupadd_test.py
    tests/unit/modules/jboss7_test.py
    tests/unit/states/jboss7_test.py
 2015-08-25 13:55:44 -06:00
Erik Johnson
ede057eebc Fix tests to reflect args being passed as lists instead of strings 2015-08-24 23:54:09 -05:00
Pedro Algarvio
016e350c0f Merge pull request #26541 from terminalmage/masterless-winrepo 
Make winrepo execution module use the same code as the runner
 2015-08-22 22:47:31 +01:00
Erik Johnson
81a0d4c915 Skip tests that don't work with older mock 
This fixes test failures on RHEL6 builds.

This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
 2015-08-21 21:35:11 -05:00
Colton Myers
55ecff1278 Merge branch 'merge-forward-2015.8' of https://github.com/basepi/salt into basepi-merge-forward-2015.8 
Conflicts:
    salt/utils/event.py
 2015-08-21 16:37:24 -06:00
Erik Johnson
e7099af0f6 Get rid of useless unit tests and add integration test for winrepo 2015-08-21 13:14:42 -05:00
Ivan Babrou
c228088de6 Properly check for ipset ranges, fixes #26453 
This add support for idempotent runs of `ipset.present` state
if ranges are used as entries. IP1-IP2 and IP/MASK variants
are supported.
 2015-08-21 09:42:51 -06:00
Erik Johnson
d2166e95cb Fix formatting 2015-08-21 10:19:36 -05:00
Colton Myers
ff2d6c6045 Fix git test 2015-08-20 16:23:36 -06:00
Colton Myers
a3fc46da0b py3 compat 2015-08-20 16:23:32 -06:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
Colton Myers
28aa9b1058 Merge pull request #26486 from thusoy/git-confidential-auth 
Git: Don't leak https user/pw to log
 2015-08-20 10:04:52 -06:00
Tarjei Husøy
5289165487 Git: Don't leak https user/pw to log 2015-08-19 23:58:08 -07:00
Mike Place
a9b28e9577 Merge pull request #26483 from thusoy/git-user-only-auth 
Handle user-only http auth in git module
 2015-08-19 16:47:41 -06:00
Jenkins
9d3f0624b4 Lint 2015-08-19 14:36:23 -06:00
Jenkins
5b7389d80e Fix schedule test error on py26 2015-08-19 14:33:38 -06:00
Tarjei Husøy
09fc934acc Handle user-only http auth in git module 2015-08-19 11:46:30 -07:00
Colton Myers
f6481a1fb3 Merge pull request #26410 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-18 11:52:13 -06:00
Colton Myers
38f22875e1 Fix schedule test failures 
Includes removal of heavily-mocked test_list and test_reload
 2015-08-18 10:48:01 -06:00
Mike Place
a3b32bbc9e Merge pull request #26413 from evverx/fix-start-restart-reload-and-force-reload 
Fix service.{start,restart,reload,force-reload} for masked services
 2015-08-18 08:16:15 -06:00
Erik Johnson
94941fbed1 Remove git unit tests 
These tests are useless, they assert true results while mocking
cmd.run_all to always return True with retcode 0. Nothing but a waste of
CPU cycles.
 2015-08-17 22:10:33 -05:00
Evgeny Vereshchagin
31ac42cac3 Fix service.{start,restart,reload,force-reload} for masked services 2015-08-18 00:57:52 +00:00
Colton Myers
d3d0e004d9 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/keystone.py
    salt/modules/pw_user.py
    salt/states/reg.py
    setup.py
 2015-08-17 16:54:16 -06:00
Evgeny Vereshchagin
ab4d6e5323 Fix service.enable for masked services 2015-08-17 14:00:20 -06:00
Justin Findlay
7e94989403 mock pwd calls in pw_user exec mod test 
Fixes #26266.
 2015-08-13 13:20:11 -06:00
Justin Findlay
4cf9a16e63 Merge pull request #26224 from cachedout/fopen_2015_8 
Cleanup of a few cases to move to salt.utils.fopen
 2015-08-12 14:15:49 -06:00
Mike Place
b5980ca54a Migrate wtmp beacon to fopen 2015-08-11 15:57:04 -06:00
Colton Myers
49fb19049b Remove outdated heavily-mocked unit test 2015-08-10 16:54:17 -06:00
Colton Myers
0fc16040d6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/__init__.py
    salt/cloud/clouds/vmware.py
    salt/loader.py
    salt/minion.py
    salt/modules/archive.py
    salt/modules/file.py
    salt/states/pkg.py
    salt/utils/http.py
 2015-08-10 13:21:57 -06:00
Mike Place
2704094e21 Merge pull request #26125 from evverx/timedatectl-settz 
Use timedatectl set-timezone to tzsetting if available
 2015-08-10 08:43:41 -06:00
Erik Johnson
18ebdd382a Update winrepo tests with new param names 2015-08-09 21:19:45 -05:00
Evgeny Vereshchagin
e5eaf4686a Use timedatectl set-timezone to tzsetting 
Fixed #26122
 2015-08-09 06:00:35 +03:00
C. R. Oldham
28329fff55 These tests make no sense now that the proxy interface is module based and not object based. 2015-08-08 14:44:33 -06:00
Colton Myers
a4d4f8c5f8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/modules/layman.py
    salt/modules/win_system.py
 2015-08-05 15:30:04 -06:00
twangboy
0502897635 Fixed the lint... again 2015-08-04 17:43:58 -06:00
twangboy
6f85d6b9af Fixed some lint 2015-08-04 17:13:47 -06:00
Justin Findlay
9156bbd33e update win_system exec mod unit tests 2015-08-04 15:55:32 -06:00
Colton Myers
4d8ba6b874 Remove reg unit tests, not applicable to latest version of reg module 2015-08-03 12:03:03 -06:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
 2015-07-30 16:54:44 -06:00
Stanislav Blokhin
595da6252e Configurable AWS region & region from IAM metadata 2015-07-24 16:06:20 +02:00
Andreas Lutro
dd2a188c05 fix tests 2015-07-23 15:17:18 +02:00
Colton Myers
c63ef2c7b2 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/modules/gem.py
    salt/modules/ssh.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/states/pkg.py
    salt/utils/__init__.py
    salt/utils/s3.py
 2015-07-22 12:05:50 -06:00
Erik Johnson
123b8ee1cb Fix mock_open patch 
Forgot to add this when I removed the decorator in my previous commit.
 2015-07-22 11:09:15 -05:00
Erik Johnson
af82835f42 Move patching of mock_open to within test 
This keeps the tests from failing on platforms like RHEL6 where
unittest2 has no mock_open.
 2015-07-22 03:04:07 -05:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
twangboy
5008bfee96 Merge branch '2015.5' of https://github.com/saltstack/salt into fix_21041_again 2015-07-20 12:51:43 -06:00
twangboy
8b2dc681f9 Fixed the gem module to work on windows... without injection 2015-07-20 12:50:33 -06:00
Joe Julian
1b7a56aa38 Add support for pyOpenSSL > 0.10 
Centos 6 doesn't provide a packaged version of pyOpenSSL > 0.10. Allow
the tls module to work with that minimum version. This will not allow
X509 extensions to work but will allow everything else.

Fixes #25384
 2015-07-15 16:49:54 -07:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
 2015-07-08 16:24:58 -06:00
rallytime
138c4f1e72 Remove parted deprecations and fix failing tests 2015-07-08 09:03:55 -06:00
rallytime
f959e165a1 Clean up imports 2015-07-07 06:28:10 -06:00
rallytime
fbc9c0d6bf Fix Pylint 2015-07-07 05:43:00 -06:00
Colton Myers
9fde9df55b Remove tests (glance rewrite requires test rewrite) 2015-07-06 14:13:15 -06:00
rallytime
fe2561f415 Update moto version check in boto_vpc_test and update min version 
Fixes #24272
 2015-07-06 14:03:59 -06:00
Colton Myers
24d51fb8f1 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/configuration/minion.rst
    salt/config.py
    salt/modules/sudo.py
    tests/integration/states/file.py
 2015-07-02 09:46:36 -06:00
Justin Findlay
a98394210e Merge pull request #25095 from jfindlay/win_groupadd_test 
Win groupadd unit tests
 2015-07-01 12:18:53 -06:00
Justin Findlay
564dffd14a depend on win libs rather than mocking them 2015-07-01 11:14:19 -06:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
 2015-06-29 16:49:40 -06:00
Thomas S Hatch
51ac7ae038 Merge pull request #24963 from whytewolf/neutron-update 
Neutron.create_network more in line with neutron net-create, with test
 2015-06-29 09:46:08 -07:00
Jayesh Kariya
e3045be5a9 adding redismod unit test case. 2015-06-29 14:13:45 +05:30
Gareth J. Greenaway
55eb73b0c9 fixing unit tests. 2015-06-25 11:33:36 -07:00
Thomas Phipps
09ed674491 forgot the unit test. or at least couldn't find it originally. 2015-06-24 17:09:13 -07:00
Thomas S Hatch
2a91f6f06d Merge pull request #24734 from garethgreenaway/config_changes 
Alllow configuration items using either module.key or module:key
 2015-06-24 10:46:09 -06:00
Daniel Hobley
7fb0ba0523 Fixed lint issues 2015-06-23 10:46:37 +02:00
Daniel Hobley
0a9294d384 Fixed unit tests for win_powercfg 2015-06-23 09:39:35 +02:00
rallytime
a306216ab9 Merge branch '2015.5' into merge_forward_develop 2015-06-19 16:37:56 -06:00
Gareth J. Greenaway
e4188e1d1f Updating slack_notify tests to reflect changes. 2015-06-18 13:39:24 -07:00
Mike Place
f3b06081fc Lint win_status 2015-06-18 14:29:19 -06:00
twangboy
98e7e90299 Fixed test failures for Colton 2015-06-18 12:58:18 -06:00
Mike Place
558ce63b31 Skip encoding tests if unsupported 2015-06-18 12:06:10 -06:00
Chris McMacken
3025ba1ec1 Adding a couple of tests for grant_exists 2015-06-18 08:00:23 -05:00
Mike Place
3401f9d154 Merge pull request #24763 from cachedout/fix_lint_24590 
Lint riak
 2015-06-17 13:04:40 -06:00
Mike Place
511e24dc5f Lint riak 2015-06-17 13:03:35 -06:00
Mike Place
c3fcef0d8a Merge pull request #24590 from dmyerscough/riak-features 
Additional riak functions
 2015-06-17 13:03:19 -06:00
Justin Findlay
1753234bab Merge pull request #24615 from msteed/py3-unittests-5 
py3 unittest compat
 2015-06-16 09:25:19 -06:00
Mike Place
678ce0ce55 Merge pull request #24629 from frostyslav/develop 
Add username/password support to artifactory module
 2015-06-16 09:02:39 -06:00
Rostyslav Fridman
18f08c5064 Fix tests for artifactory module 2015-06-16 13:02:57 +03:00
Gareth J. Greenaway
56ee5b707c updating unit tests to reflect changes. 2015-06-12 21:56:58 -07:00
Michael Steed
ca34897d2c py3: fix salt/modules/win_status.py and tests 2015-06-11 15:39:39 -06:00
Damian Myerscough
7ceffd4c54 Additional riak functions 2015-06-10 22:14:03 -07:00
Thomas S Hatch
5ec9d331cf Merge pull request #24124 from ticosax/mine-dockerng 
[dockerng] Migrate salt.mine to dockerng
 2015-06-10 20:15:17 -06:00
Thomas S Hatch
d3feedd174 Merge pull request #24557 from msteed/py3-unittests-4 
More py3 unittest fixes
 2015-06-10 20:14:14 -06:00
Thomas S Hatch
14c22e66f4 Merge pull request #24552 from joejulian/develop_dont_pollute_environment 
Don't pollute the TZ environment variable
 2015-06-10 20:13:21 -06:00
Thomas S Hatch
5df5fb002e Merge pull request #24519 from dmyerscough/riak-module 
Additional Riak features with error messages printed
 2015-06-10 20:10:29 -06:00
Thomas S Hatch
94067fdc72 Merge pull request #24511 from jquast/rabbitmq-trailing-outp-fix 
bugfix: trailing "...done" in rabbitmq output
 2015-06-10 20:09:23 -06:00
Nicolas Delaby
1e8e082f40 Migrate salt.mine to dockerng 2015-06-10 08:59:03 +02:00
Damian Myerscough
a8254f1602 Fixing pylint errors 2015-06-09 22:29:44 -07:00
Damian Myerscough
59e04d163c Fixing unittests for new functionality 2015-06-09 20:52:41 -07:00
Jeff Quast
a154280b34 bugfix: trailing "...done" in rabbitmq output 
Problem
-----------

Some versions of rabbitmq (v3.4.1) does not output any final
"...done" line in output of listings, but the given salt code
unconditionally removed the final line of output, which may
often result in inconsistent behavior of dependent state
functions, where the final line has a value that is significant.

Solution
-----------

This bugfix changes this output manipulation to be conditional,
matching only lines of ``"Listing ..."`` as the first, and
``"...done"`` as the last.

Details
---------

In my environment::

    [rabbitmq@db01 ~]$ rabbitmqctl list_vhosts
    Listing vhosts ...
    /

This causes issues in, for example, a vhost is attempted to
be created for '/' that already exists, if that vhost happens
to be the last one listed in command output, it is thought
non-existent, resulting in state failure::

    Failure: rabbitmq_vhost_|-rabbitmq-vhost_|-/_|-present: Creating vhost "/" ...
    Error: vhost_already_exists: /
 2015-06-09 17:30:40 -07:00
Joe Julian
91998936a9 Don't pollute the TZ environment variable 
Fixes #24480
 2015-06-09 14:40:37 -07:00
Joe Julian
cfc3b43ba2 Don't pollute the TZ environment variable 2015-06-09 14:26:27 -07:00
Michael Steed
f43d5631f1 py3: fix tests/unit/modules/win_status_test.py 
Use types.ModuleType() instead of new.module()
 2015-06-09 15:14:51 -06:00
Michael Steed
ddde2e1e39 use a realistic service sid in test_getsid() 2015-06-09 14:50:30 -06:00
Michael Steed
f9cf15ad46 fix new failures on ubuntu 14.04 2015-06-09 14:18:04 -06:00
Michael Steed
afbd52bad7 py3: fix tests/unit/modules/win_network_test.py 
Use types.ModuleType() instead of deprecated new.module()
 2015-06-09 14:08:44 -06:00
Michael Steed
6abd6d2623 py3: fix tests/unit/modules/win_dns_client_test.py 
Use types.ModuleType() instead of deprecated new.module()
 2015-06-09 14:06:38 -06:00
Joe Julian
76e2583265 Merge tls changes from develop 2015-06-09 12:48:36 -07:00
Michael Steed
f725b8e4fe lint 2015-06-09 13:14:54 -06:00
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
0543f9aa0d fix tests/unit/modules/network_test.py 
Explicitly test salt.ext.ipaddress in test_is_private() and
test_is_loopback() as originally intended.
 2015-06-09 12:13:04 -06:00
Michael Steed
ce5f14bb0e set encoding in test__unicode_match() 2015-06-09 11:19:51 -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
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
Joe Julian
4a840f39d5 Fix tls test to work against develop branch 2015-06-08 17:36:29 -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
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
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
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
Colton Myers
5833a0e535 Disable tls tests (for now) 2015-06-08 15:27:47 -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
3c5e82e878 py3: fix tests/unit/modules/deb_apache_test.py 2015-06-08 08:48:55 -06:00
Michael Steed
a1b693a9d1 fix failure in btrfs_test.py 
test was failing on machines where /dev/sda3 was mounted
 2015-06-08 08:48:33 -06:00
Michael Steed
83a96367a4 Manual merge of #24414 per thatch45 2015-06-06 07:47:52 -06:00
Colton Myers
9cf402e0a7 Python3 compat 2015-06-05 13:52:35 -06:00
Colton Myers
6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/modules/all/salt.modules.system_profiler.rst
    salt/fileclient.py
    salt/loader.py
    salt/modules/tls.py
    salt/modules/win_path.py
    salt/states/pkg.py
    salt/utils/event.py
    salt/utils/pagerduty.py
    tests/unit/modules/seed_test.py
 2015-06-05 13:03:48 -06:00
Gareth J. Greenaway
c95f8be0ae Updating unit tests based on changes to module. 2015-06-04 20:33:52 -07:00
Justin
1df4020ec2 Changed mock path to be absolute in test_parse_targets 2015-06-04 11:11:33 -06:00
Justin Findlay
deaee68b89 Merge pull request #24371 from joejulian/2015.5_tls_module_tests 
2015.5 tls module tests
 2015-06-04 09:20:16 -06:00
Christophe Drevet-Droguet
7b9451451f module grains tests: test list order preservation 2015-06-04 09:52:09 +02:00
Justin
7570ae9132 Disabled flaky test to review later 2015-06-03 16:27:33 -06:00
Joe Julian
4c5dee1e25 Add @destructiveTest decorator to destructive tests 2015-06-03 15:27:05 -07:00
Joe Julian
274bbd4d43 Accept results from older pyOpenSSL 2015-06-02 18:17:05 -07:00
Joe Julian
161f913522 All cert info should be in UTC always 2015-06-02 18:17:05 -07:00
Joe Julian
9affcca766 See the whole diff if dict compare fails 2015-06-02 18:17:05 -07:00
Joe Julian
94f620857c Ignore extensions for now. Resolve this as part of fixing issue 24338. 2015-06-02 18:17:04 -07:00
Joe Julian
84904d31f1 Mask lint warning for unused imported module 2015-06-02 18:17:04 -07:00
Joe Julian
5675b78459 Do not test if PyOpenSSL is not installed 2015-06-02 18:17:04 -07:00
Joe Julian
563cc66311 Add tls tests 2015-06-02 18:17:04 -07:00
Christophe Drevet-Droguet
756f5d8716 new set function for module grains, and unit tests 2015-06-02 15:41:26 +02:00
Nicole Thomas
e7542e7a38 Merge pull request #24236 from jdsieci/develop 
RedHat IPv6 static routes
 2015-05-30 21:34:24 -06:00
Jerzy Drozdz
2f3d0298af pylint volation fixes 2015-05-30 02:04:49 +02:00
Colton Myers
5fcbcfe6d5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    doc/topics/tutorials/index.rst
    salt/cloud/clouds/digital_ocean.py
    salt/modules/lxc.py
    salt/returners/__init__.py
 2015-05-29 17:33:28 -06:00
Jerzy Drozdz
9eb9892516 Changed return values and assertions to lists 2015-05-30 01:03:43 +02:00
Thomas S Hatch
a28515aa2c Merge pull request #23060 from makinacorpus/service 
ubuntu systemd/legacy init support
 2015-05-29 17:02:08 -06:00
Colton Myers
75590cf490 Merge pull request #24080 from makinacorpus/lxc_consistency2 
Lxc consistency2
 2015-05-29 16:51:54 -06:00
Jerzy Drozdz
e564a0b473 Added setting of __grains__['osrelease'] in test 2015-05-30 00:16:25 +02:00
Colton Myers
90cb448910 Fix rest of rabbitmq tests 2015-05-29 15:11:25 -06:00
Colton Myers
7736509c6b Fix rabbitmq test 2015-05-29 15:11:19 -06:00
Jayesh Kariya
9b9aeb8628 resolved all erors. 2015-05-29 12:49:23 +05:30
Jayesh Kariya
aaf89354c0 adding win_groupadd unit test case. 2015-05-28 17:12:58 +05:30
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
 2015-05-26 16:38:42 -06:00
rallytime
ac0f97de51 Fixes the boto_vpc_test failure on CentOS 5 tests 
pkg_resources.get_distribution doesn't work on CentOS 5 since it looks
for moto in site-packages and not pip (which is how we're installing it
in the salt-jenkins states).

This catches the exception through by get_distribution so we can run the
rest of the tests in this file.
 2015-05-26 12:25:51 -06:00
Thomas S Hatch
dd90ef09b9 Merge pull request #24078 from jfindlay/locale_charmap 
if a charmap is not supplied, set it to the codeset
 2015-05-25 13:39:19 -06:00
Jayesh Kariya
e11988969f adding varnish unit test case 2015-05-25 16:01:02 +05:30
Mathieu Le Marec - Pasquet
458f50617b seed: lint 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-24 14:50:24 +02:00
Mathieu Le Marec - Pasquet
96b8d55f14 Fix seed.mkconfig yamldump 
This fixes #24071

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-24 14:07:07 +02:00
Justin Findlay
5eb97f0973 if a charmap is not supplied, set it to the codeset 
Fixes #23221.
 2015-05-22 14:48:39 -06:00
Gareth J. Greenaway
a09f0b23bd Updating schedule unit tests to align with refactoring changes. 2015-05-22 09:17:53 -07:00
Colton Myers
58aed60838 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/runners/lxc.py
 2015-05-21 11:27:52 -06:00
Jayesh Kariya
1ec33e22a7 removed assertion error 2015-05-21 18:57:58 +05:30
Jayesh Kariya
16ecb28950 adding timezone unit test case 2015-05-21 17:05:56 +05:30
Colton Myers
9dbafcc051 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/tls.py
 2015-05-20 11:59:59 -06:00
Jayesh Kariya
89eb00815e adding system unit test case 2015-05-20 16:06:10 +05:30
Colton Myers
ed3a71dc72 Fix scheduleadd test 2015-05-19 09:53:01 -06:00
Colton Myers
6530a20340 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    pkg/suse/salt.changes
    salt/modules/lxc.py
    salt/modules/ps.py
    salt/states/cloud.py
 2015-05-18 11:39:43 -06:00
Jayesh Kariya
280abdec7c adding sysbench unit test case 2015-05-18 17:43:37 +05:30
Weilu Jia
64634b6349 Update psutil.pid_list to use psutil.pids 2015-05-15 14:25:03 -07:00
Weilu Jia
8a1da33ada Fix test cases by mocking psutil_compat 2015-05-15 14:11:12 -07:00
Weilu Jia
7d02ad4f06 Fix some of the mock names for the new API 2015-05-15 13:03:26 -07:00
Weilu Jia
93ee411fd5 Create compatability psutil. 
psutil 3.0 drops 1.0 API, but we still support old psutil versions.
 2015-05-15 13:03:25 -07:00
Colton Myers
4ea3f8f80a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/pillar/neutron.py
    salt/utils/http.py
 2015-05-15 13:43:40 -06:00
Justin Anderson
982f87316d Merge pull request #23781 from jfindlay/fix_locale_tests 
fix unit test mock errors on arch
 2015-05-15 13:40:07 -06:00
Justin Findlay
14c711eeb3 fix unit test mock errors on arch 2015-05-15 12:50:55 -06:00
Justin Findlay
aab9c431d0 Merge pull request #23777 from jfindlay/merge_23665 
Merge #23665
 2015-05-15 12:16:21 -06:00
Thomas S Hatch
348645ecd5 Merge pull request #23736 from jfindlay/fix_pip 
always load pip execution module
 2015-05-15 12:10:16 -06:00
Justin Findlay
87e000d053 fix ssh module unit tests 2015-05-15 11:11:29 -06:00
Jayesh Kariya
19939cfa98 adding svn unit test case 2015-05-15 17:39:21 +05:30
Javier Domingo
63620725c3 Remove trailing whitespace 2015-05-15 13:00:11 +02:00
Justin Findlay
b8867a8c23 update pip tests 2015-05-15 00:15:26 -06:00
Javier Domingo Cansino
5cab0ecc95 ssh: AuthorizedKeysFile expands defined tokens 2015-05-15 00:45:24 +02:00
Justin Findlay
e90bb252d3 update debian_ip unit tests 
Related to 5ff749e4 (#23554).
 2015-05-14 13:45:06 -06:00
Colton Myers
7d8038f134 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    debian/changelog
    salt/modules/win_pkg.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-05-14 10:27:00 -06:00
Justin Findlay
e480f13688 Merge pull request #23675 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-13 12:35:54 -06:00
Colton Myers
5ee7f25ee4 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-13 11:50:33 -06:00
Colton Myers
acdd3fc6bd Fix lint 2015-05-13 11:47:43 -06:00
Jayesh Kariya
17987d97f0 made changes to test_interfaces function. 2015-05-13 10:35:05 -06:00
Jayesh Kariya
6e05148962 adding solr unit test case 2015-05-13 17:14:53 +05:30
Jayesh Kariya
0936e1d386 made changes to test_interfaces function. 2015-05-13 11:09:40 +05:30
Colton Myers
eca368a0ee Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-12 16:09:12 -06:00
Colton Myers
680e88f058 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/modules/ebuild.py
    tests/unit/modules/grains_test.py
 2015-05-12 16:06:36 -06:00
Nicole Thomas
cbe32828ef Merge pull request #23580 from jayeshka/smf-unit-test 
adding smf unit test case
 2015-05-12 10:29:58 -06:00
Daniel Hobley
30d8be877d Lint fixes 2015-05-12 15:48:53 +02:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions 
- Allows you to set power settings on a windows minion for things like the monitor and disk
 2015-05-12 14:49:48 +02:00
Jayesh Kariya
4f9719157b adding smf unit test case 2015-05-12 18:06:49 +05:30
Colton Myers
9b2f27b87f Remove unused mock_open 2015-05-11 15:52:24 -06:00
Colton Myers
3c51d36599 Remove tests.unit.modules.seed_test.test_mkconfig 
Was creating False.pem and False.pub files, and wasn't compatible with
new crypt.py changes. Should be rewritten as a proper, destructive,
integration test.
 2015-05-11 15:11:58 -06:00
Christophe Drevet-Droguet
ebff9df5b2 fix pylint errors 2015-05-11 21:21:10 +02:00
Justin Findlay
e9b94d36d3 additional mock for rh_ip_test test_build_bond 
Fixes #23473.
 2015-05-11 12:31:24 -06:00
Colton Myers
1d77ae9072 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/modules/hipchat.py
    salt/modules/random_org.py
    salt/modules/serverdensity_device.py
    salt/modules/slack_notify.py
    salt/returners/__init__.py
    salt/states/iptables.py
 2015-05-11 11:38:03 -06:00
salt_build
b3f284c517 Fixed tests 2015-05-11 15:49:19 +00:00
Jayesh Kariya
3ad5314ee0 adding service unit test case 2015-05-11 18:01:10 +05:30
Christophe Drevet-Droguet
c4954046ad unit tests for grains.append module function 
- separate test functions for every return
- add tests for nested lists
- add test for appending to an element of a list (fails silently)
 2015-05-10 17:27:32 +02:00
Christophe Drevet-Droguet
0c9a32326c use MagickMock 2015-05-09 18:34:02 +02:00
Christophe Drevet-Droguet
c838a22377 unit tests for grains.append module function 2015-05-08 21:01:36 +02:00
Justin Findlay
604857811e Merge pull request #23495 from jayeshka/seed-unit-test 
adding seed unit test case
 2015-05-08 11:30:38 -06:00