valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
50,430 Commits 24 Branches 182 Tags 341 MiB
9ec426bdb2
Commit Graph

2066 Commits

Author SHA1 Message Date
Thomas Jackson
234d02b218 Add timeout to saltnado's event listener 
Fixes #21707

The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
 2015-03-18 08:09:41 -07:00
Justin Findlay
5f143ecb60 unit tests for states.archive.extracted tar opts 
Implements tests for #20795.
 2015-03-17 20:40:20 -06:00
Thomas Jackson
205787c256 Add timeout to saltnado's event listener 
Fixes #21707

The issue is basically that the master has seen N minions-- and not all N are currently connected. The publish job returns to the salt-api that N minions got the job-- and it dutifilly waits for all the returns. With this we use the same ping timeout that the CLI does while waiting for returns. So once all minions are no longer running the job we will return.
 2015-03-17 19:17:32 -07:00
Justin Findlay
53c9d48331 fix typo 2015-03-17 19:58:05 -06:00
Justin Findlay
b1fe4f02c3 fix localemod unit tests for merge forward 2015-03-17 15:14:29 -06:00
Colton Myers
065f573bad Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    salt/master.py
 2015-03-17 13:35:32 -06:00
Peter Smith
d2281e36da Changed 17 to 16; manually tested and verified this is correct. 2015-03-17 13:34:43 -05:00
Peter Smith
31f64f13e3 Merge remote-tracking branch 'remote_saltstack_salt_develop/develop' into develop 2015-03-17 12:59:50 -05:00
Jayesh Kariya
7a0e1bc95e adding pyenv unit test 2015-03-17 15:07:41 +05:30
Peter Smith
926b417c4e Merge branch 'local_develop', remote branch 'remote_saltstack_salt_develop/develop' into develop 2015-03-16 23:07:42 -05:00
Peter Smith
4541e6962f Merge remote branch 'remote_saltstack_salt_develop/develop' into develop 2015-03-16 17:27:33 -05:00
Peter Smith
639a3e0b32 Updated Unit test from 11 to 17, to support 16 Dell DRAC user entries. 2015-03-16 17:06:13 -05:00
Colton Myers
fd93491a5f Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/cloud/clouds/linodepy.py
	salt/master.py
	salt/modules/boto_route53.py
	salt/modules/virt.py
	salt/renderers/gpg.py
	salt/runners/doc.py
	salt/runners/jobs.py
	salt/runners/manage.py
	salt/runners/virt.py
	salt/utils/event.py
	salt/utils/http.py
 2015-03-16 15:12:02 -06:00
Alexander Schwartz
5f11f7b74c added tests to ensure commands are created accordingly (without additional single quotes) 2015-03-16 14:49:09 -06:00
Thomas S Hatch
f2d2348bc4 Merge pull request #21675 from gracinet/test_git_pillar 
Tests for git_pillar
 2015-03-16 12:35:15 -06:00
Georges Racinet
458cc64886 Pylint error + standalone launcher 2015-03-16 18:13:52 +01:00
Jayesh Kariya
a6f867630f adding rabbitmq unit test 2015-03-16 10:28:13 +05:30
Georges Racinet
2901c98119 git_test: credits 2015-03-15 19:07:34 +01:00
Georges Racinet
0dae9dfa5d Tests for git_pillar 
Two different calls of the `ext_pillar` entry function are checked, a
direct one and one from upper in the calling stack (more integration)
The different options show the slight differences (almost side effects
between them).

A third test is included to detect infinite recursions, to avoid future
refactors that could bring them back accidentally.
 2015-03-15 18:50:57 +01:00
Alexander Schwartz
fcd6699774 added tests to ensure commands are created accordingly (without additional single quotes) 2015-03-14 21:37:07 +00:00
Alexander Pyatkin
b23c0fa499 Make enhancements to htpasswd modules 2015-03-13 21:18:50 +00:00
Thomas S Hatch
cc9d294fcd Merge pull request #21569 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-03-12 13:36:39 -06:00
jfindlay
396e8a5938 Merge pull request #20779 from cachedout/issue_20647 
Use declared yaml options
 2015-03-12 12:03:15 -06:00
Justin Findlay
fd829a95ff compare OrderedDicts in serializer unit test 2015-03-12 10:47:34 -06:00
Jayesh Kariya
e4116bb4f1 adding qemu_nbd unit test 2015-03-12 10:55:36 +05:30
Colton Myers
bdfdd3f232 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/virt.py
 2015-03-11 16:09:57 -06:00
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
 2015-03-11 15:14:56 -06:00
Thomas S Hatch
4873382184 Merge pull request #21487 from rallytime/bp-21469 
Backport #21469 to 2014.7
 2015-03-11 15:05:08 -06:00
Mike Place
debc936d29 Re-align test for saltclienterror exception 2015-03-11 13:43:55 -06:00
Ross Perkins
d15f8671b6 composer.install module does not support always_check, only the state does. Removing the test on the module. 2015-03-11 12:19:48 -07:00
Ross Perkins
d473408074 composer.install module does not support always_check, only the state does. Removing the test on the module. 2015-03-11 12:19:17 -07:00
Ross Perkins
3f3218d853 Fix for issue #21491 2015-03-11 11:33:39 -07:00
Ross Perkins
159d38e757 Fix for issue #21491 2015-03-11 10:56:53 -07:00
Thomas S Hatch
214f522ae1 Merge pull request #21532 from jayeshka/poudriere-unit-test 
adding poudriere unit test
 2015-03-11 11:18:03 -06:00
Thomas S Hatch
13b7046227 Merge pull request #21461 from jfindlay/refactor_crons 
Refactor unix crons
 2015-03-11 09:52:28 -06:00
Jayesh Kariya
fc9a12e6db adding poudriere unit test 2015-03-11 10:24:19 +05:30
Justin Findlay
5dc09e7da1 update cron and cmd tests for cron runas changes 2015-03-10 15:57:24 -06:00
rallytime
8c55294212 Remove pylint disable/enable comments 2015-03-10 15:56:07 -06:00
rallytime
254c17d910 Just use nested with statements instead of \ contiuation 
Python 2.6 doesn't like that.

This should fix the test errors we are seeing on CentOS 6 and
Ubuntu 10 in the test suite.
 2015-03-10 15:11:39 -06:00
Ross Perkins
8083cf554d Backport of PR #21358 to 2014.7 2015-03-10 09:38:16 -07:00
Thomas S Hatch
0a96d5766e more lint 2015-03-10 10:30:49 -06:00
Thomas S Hatch
4b92e77769 Merge branch 'uptime' of https://github.com/arthurlogilab/salt into arthurlogilab-uptime 2015-03-10 10:29:22 -06:00
Vincent Desjardins
d5293901bc fixes #20198: virt.get_graphics and virt.get_nics calls in module virt 2015-03-10 09:17:48 -06:00
Nicole Thomas
827541ef3a Merge pull request #21469 from vdesjardins/develop 
fixes #20198: virt.get_graphics and virt.get_nics calls in module virt
 2015-03-10 09:16:49 -06:00
Arthur Lutz
05c8926624 another pylint round 2015-03-10 13:01:37 +01:00
Arthur Lutz
56878e2897 pylint round 2 2015-03-10 12:02:37 +01:00
Arthur Lutz
375e8c79bc pylint round on uptime_test.py 2015-03-10 11:32:16 +01:00
Jayesh Kariya
625b3f48f0 adding znc unit test 2015-03-10 10:36:10 +05:30
Vincent Desjardins
7e517a6a5a fixes #20198: virt.get_graphics and virt.get_nics calls in module virt 2015-03-09 22:10:38 -04:00
Justin Findlay
7a49e3e877 fix test lint 2015-03-09 16:00:10 -06:00
Justin Findlay
2c04a36efa fix iptables tests 2015-03-09 15:09:55 -06:00
Thomas S Hatch
268ee22d92 Merge pull request #21314 from arthurlogilab/postgresql 
[modules/postgresql] modules for cluster management in postgresql (debian specific)
 2015-03-09 11:09:56 -06:00
jfindlay
7ed498d3bf Merge pull request #21420 from jayeshka/win_useradd-unit-test 
win_useradd unit test case
 2015-03-09 10:03:25 -06:00
Jayesh Kariya
15b295ef95 removed second pylint error 2015-03-09 15:12:56 +05:30
Jayesh Kariya
529a57ebcb removed pylint error 2015-03-09 14:48:49 +05:30
Jayesh Kariya
51f00580f1 win_useradd unit test case 2015-03-09 14:08:05 +05:30
Jayesh Kariya
f167fafc12 pkgutil unit test case 2015-03-09 13:16:45 +05:30
Arthur Lutz
815a9156eb [uptime] add execution modules and state modules for managing urls monitored by uptime 
(open source nodejs/mongodb monitoring application)

Test included
 2015-03-06 19:42:27 +01:00
Mathieu Le Marec - Pasquet
5f4905da62 fix tests 2015-03-06 17:13:31 +01:00
Mathieu Le Marec - Pasquet
f1111bd238 lint 2015-03-06 16:20:17 +01:00
Ross Perkins
3cf3ccfa8a Fix module: composer.install so it doesn't care what kind of output is returned by composer, and it relies exclusively on the return code instead. 
Add module: composer.update
Add module: composer.selfupdate
Fix state: composer.installed to support test mode
Add state: composer.update
Updated tests.
 2015-03-05 19:20:52 +01:00
Paul Tonelli
ca4061b5b8 add hg_pillar and corresponding unit test 2015-03-04 19:00:23 +01:00
Arthur Lutz
592e0a1402 [modules/postgresql] modules for cluster management in postgresql (debian specific) 
related to  #21293
 2015-03-04 18:33:20 +01:00
Jayesh Kariya
323c195bcc adding win_timezone unit test case 2015-03-03 18:46:53 +05:30
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
rallytime
b01196e7e8 Add transport key to mocked opts to fix batch unit tests 2015-02-27 14:53:58 -07:00
Pedro Algarvio
62f868a076 Merge branch '2015.2' into develop 2015-02-27 10:02:47 +00:00
rallytime
cd5ad52c2e Fix pylint errors on develop 2015-02-26 09:43:52 +00:00
Pedro Algarvio
a24ae29ee9 Revert "We no longer warn." 
This reverts commit 5d35f856ac.
 2015-02-26 09:41:22 +00:00
rallytime
565f10959d Add transport key to mocked opts to fix batch unit tests 2015-02-25 13:51:25 -07:00
Mike Place
b4bd491f8e Merge pull request #20981 from makinacorpus/psql 
postgres: role update support
 2015-02-25 09:35:15 -07:00
Mike Place
dd17969b7b Merge pull request #21018 from jayeshka/win_ntp-unit-test 
adding win_ntp unit test case
 2015-02-25 09:19:37 -07:00
Jayesh Kariya
d7a0ca956d adding win_shadow unit test case 2015-02-25 18:48:05 +05:30
Jayesh Kariya
5e851b3789 adding win_ntp unit test case 2015-02-25 18:46:45 +05:30
jfindlay
35f1266c86 Merge pull request #20968 from jayeshka/win_firewall-unit-test 
adding win_firewall unit test case
 2015-02-24 16:23:40 -07:00
Mathieu Le Marec - Pasquet
126e29c3eb pgsql: fix tests 2015-02-24 21:01:13 +01:00
Thomas S Hatch
cd072876b7 Merge pull request #20942 from cachedout/context_cache 
Context cache
 2015-02-24 11:30:11 -07:00
Jayesh Kariya
d5b70b5fea adding win_firewall unit test case 2015-02-24 18:58:55 +05:30
jfindlay
a38c17efde Merge pull request #20901 from aspyatkin/feature-bower 
Add Bower execution and state modules
 2015-02-23 21:40:10 -07:00
Mike Place
26b3ec0be3 Context cache decorator 2015-02-23 19:27:27 -07:00
Colton Myers
c8eb2d4665 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/cloud/clouds/joyent.py
	salt/daemons/flo/core.py
	salt/minion.py
 2015-02-23 14:25:51 -07:00
rallytime
0e57d8fe6e Fix pylint errors on develop 2015-02-23 12:24:53 -07:00
rallytime
c0cad91549 Fix unit test 2015-02-21 19:29:57 -07:00
Pedro Algarvio
c85d38c493 Merge pull request #20893 from cvrebert/pylint-enable 
re-enable pylint instead of disabling it twice
 2015-02-21 08:29:16 +00:00
Chris Rebert
ea02ef58b7 re-enable pylint instead of disabling it twice 2015-02-20 23:50:30 -08:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Alexander Pyatkin
c408c935a0 Implement Bower execution module 2015-02-21 05:56:20 +00:00
Chris Rebert
2a52d54a20 Avoid shadowing list type in modules.darwin_pkgutil; fixes #20120 2015-02-20 21:52:25 -08:00
Jayesh Kariya
014ce111ab adding win_autoruns unit test case 2015-02-20 19:16:09 +05:30
jfindlay
b70ffe2bb8 Merge pull request #20819 from jayeshka/slack_notify-unit-test 
adding slack_notify unit test case
 2015-02-19 08:21:30 -07:00
Jayesh Kariya
93d5a32bd8 adding rpm unit test case 2015-02-19 14:40:10 +05:30
Jayesh Kariya
6efb71fb6e adding slack_notify unit test case 2015-02-19 14:38:51 +05:30
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
 2015-02-18 11:55:29 -07:00
Nicole Thomas
e190909055 Merge pull request #20755 from jayeshka/modjk-unit-test 
adding modjk unit test case
 2015-02-17 08:38:47 -07:00
jfindlay
0c6b89e81c Merge pull request #20756 from jayeshka/npm-unit-test 
adding npm unit test case
 2015-02-17 08:38:26 -07:00
Nicole Thomas
c398669a6e Merge pull request #20754 from jayeshka/swift-unit-test 
adding swift unit test case
 2015-02-17 08:37:51 -07:00
Nicole Thomas
87b019bc8c Merge pull request #20753 from jayeshka/sdb-unit-test 
adding sdb unit test case
 2015-02-17 08:36:52 -07:00
jfindlay
d1068f5c14 Merge pull request #20752 from jayeshka/ret-unit-test 
adding ret unit test case
 2015-02-17 08:36:42 -07:00
jfindlay
1a5c187945 Merge pull request #20751 from jayeshka/openstack_config-unit-test 
adding openstack_config unit test case
 2015-02-17 08:35:42 -07:00
Jayesh Kariya
35a25e1ad6 adding sdb unit test case 2015-02-17 18:20:58 +05:30
Jayesh Kariya
f38fe3a34e adding ret unit test case 2015-02-17 18:19:04 +05:30
Jayesh Kariya
0e3a86f84b adding openstack_config unit test case 2015-02-17 18:17:10 +05:30
Jayesh Kariya
b25fc47126 adding npm unit test case 2015-02-17 18:14:15 +05:30
Jayesh Kariya
17796ca5b4 adding modjk unit test case 2015-02-17 18:12:01 +05:30
Jayesh Kariya
5098a63fd1 adding swift unit test case 2015-02-17 18:09:33 +05:30
Dennis Hall
478f42d9b2 Change Github to GitHub 2015-02-15 15:19:54 +01:00
jfindlay
59eaabea0a Merge pull request #20688 from rallytime/bp-20125 
Backport #20125 to 2015.2
 2015-02-13 11:46:21 -07:00
rallytime
1f7d257767 Add some python 3 compatibility fixes for new test files 2015-02-13 11:30:45 -07:00
Mike Place
d1d52d2245 Avoid file cache problem in pydsl tests 
Using the same copy of opts was causing the cache refresh to not find
any files because they had already been cleaned up!
 2015-02-13 10:48:39 -07:00
Mike Place
7a9428d9f5 Typo 2015-02-13 10:17:17 -07:00
Mike Place
37b375ba8b Use cls attr 2015-02-13 10:17:17 -07:00
Mike Place
b9fa5e4e29 Reset env at end of test 2015-02-13 10:17:17 -07:00
Nicole Thomas
47ac489d0e Merge pull request #20676 from jayeshka/rest_sample-unit-test 
rest_sample unit test case
 2015-02-13 08:48:21 -07:00
jfindlay
9328406c80 Merge pull request #20675 from jayeshka/neutron-unit-test 
adding neutron unit test case
 2015-02-13 08:46:39 -07:00
Jayesh Kariya
a988606cf5 adding neutron unit test case 2015-02-13 17:06:08 +05:30
Jayesh Kariya
1e7f2e7dbd rest_sample unit test case 2015-02-13 17:04:52 +05:30
Jayesh Kariya
dd72026be9 adding rdp unit test case 2015-02-13 17:03:26 +05:30
Colton Myers
b2a80b195e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-12 11:44:57 -07:00
Thomas S Hatch
9e054f3890 Merge pull request #20616 from rallytime/merge-20419 
Merge #20419 with test syntax fix
 2015-02-12 10:38:53 -07:00
Tarjei Husøy
5e05fd717a Quote iptables args with leading/trailing spaces 2015-02-12 16:35:33 +01:00
rallytime
6b2d64b557 Fix second pylint error that popped up 2015-02-11 22:07:37 -07:00
rallytime
789570fb94 Fix pylint/syntax of test in which_test to merge #20419 2015-02-11 21:48:34 -07:00
Tarjei Husøy
9f6dfb5a04 Remove lots of string concatenation in iptables module 2015-02-11 23:25:45 +01:00
Tarjei Husøy
943be9f0b3 Remove a lot of duplication in iptables module 2015-02-11 23:24:07 +01:00
Tarjei Husøy
9afc8fca8a Add support for iptables --log-* arguments 2015-02-11 23:24:06 +01:00
Tarjei Husøy
aeb91b000c Refactor after_jump handling in iptaples module 2015-02-11 23:23:20 +01:00
jfindlay
a1043ab87a Merge pull request #20605 from jfindlay/tar 
fix tar check
 2015-02-11 15:04:27 -07:00
Alexander Schwartz
7c6b8f1221 clean up lint messages 2015-02-11 19:57:14 +00:00
jfindlay
a572be2ca3 Merge pull request #20594 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-02-11 11:40:15 -07:00
Hung Nguyen Viet
d10ce3ade2 fix unittest for windows 2015-02-12 01:37:40 +07:00
Justin Findlay
657b79912e fix iptables unit tests for merge forward 2015-02-11 10:52:07 -07:00
Mike Place
5db9172884 Lint btrfs test 2015-02-10 19:09:30 -07:00
Mike Place
679d704029 Merge pull request #20514 from jayeshka/btrfs-unit-test 
adding btrfs unit test case
 2015-02-10 14:32:44 -07:00
Thomas S Hatch
54de4cc592 Merge branch 'feature-20340-gem-sources' of https://github.com/RobertFach/salt into RobertFach-feature-20340-gem-sources 2015-02-10 09:51:22 -07:00
rallytime
66cb14cea5 Fix python 3 compat errors that were inadvertently reverted 2015-02-10 09:07:09 -07:00
Mike Place
f8aeef25fc Fix mod_random test on older distros 2015-02-10 08:46:42 -07:00
Jayesh Kariya
511a496946 resolved the error 2015-02-10 11:28:01 +05:30
Nicole Thomas
a0d5c3dc79 Revert "More python 3 compatibility changes" 2015-02-09 19:57:38 -07:00
rallytime
3aa934abb4 Python 3 compat for haproxyconn_test.py 2015-02-09 17:14:04 -07:00
rallytime
bcafb5777f Python 3 compat for osxdesktop_test.py 2015-02-09 17:13:09 -07:00
rallytime
a162e6b443 Fix influx_test mocking 2015-02-09 11:55:54 -07:00
jfindlay
fea95c0866 Merge pull request #20517 from rupeshta/nagios_unit_tests 
implemented unit test cases for nagios module
 2015-02-09 08:28:24 -07:00
jfindlay
23494674a8 Merge pull request #20516 from jayeshka/haproxyconn-unit-test 
adding haproxyconn unit test case
 2015-02-09 08:26:47 -07:00
Alexander Schwartz
c05aae9ce7 added archive test script 2015-02-09 14:52:46 +00:00
Rupesh Tare
264b63b9df implemented unit test cases for nagios module 2015-02-09 19:49:14 +05:30
Jayesh Kariya
d6101705b9 adding osxdesktop unit test case 2015-02-09 18:24:45 +05:30
Jayesh Kariya
d72afef3dd adding haproxyconn unit test case 2015-02-09 18:23:22 +05:30
Jayesh Kariya
16503cba43 adding btrfs unit test case 2015-02-09 18:21:03 +05:30
Arnold Bechtoldt
9de6c1d839 improve test tests/unit/utils/validate_net_test.py useability 2015-02-09 11:52:08 +01:00
Arnold Bechtoldt
50ecfef1db do call class methods correctly 2015-02-09 09:45:12 +01:00