Commit Graph

4474 Commits

Author SHA1 Message Date
rallytime
8b1d3cdeda Use lists, not dicts, for MagicMock side_effect
Fixes the Python 2.6 test failures on develop
2015-03-30 13:46:48 -06:00
jfindlay
00749a5da8 Merge pull request #21937 from isbm/isbm-lvm-fixes
LVM module bugfixes
2015-03-30 11:52:25 -06:00
Mike Place
4538ea629f Merge pull request #22057 from jfindlay/opts_prefix
remove default prefix of '-' in archive.tar and archive.cmd_unzip
2015-03-30 10:45:11 -06:00
Colton Myers
0269f3d544 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-30 09:30:58 -06:00
Rahul Handay
9038fa2f43 Adding state.py unit test 2015-03-30 19:36:02 +05:30
Jayesh Kariya
28909e3b71 added requested change. 2015-03-30 17:48:29 +05:30
Jayesh Kariya
c8614e4708 adding supervisord unit test case 2015-03-30 16:09:38 +05:30
Evan Borgstrom
181df2e489 Fix a bug with the implicit list handling in pyobjects requisites
When specifying a requisite and you only need to list a single item you
can specify it without being wraped in a list and we will handle it
automatically.  This was being handled when we built our attrs to output
the final data, but this failed when you extended a require requisite
inside of a context manager.
2015-03-27 21:04:00 -07:00
Colton Myers
c91a593507 Fix test to give more data on failure 2015-03-27 16:50:39 -06:00
Justin Findlay
d9375adc6c fix LVM tests for new LVM code 2015-03-27 10:43:22 -06:00
Jayesh Kariya
0cedee74f5 removed pylint errors 2015-03-27 18:21:56 +05:30
Jayesh Kariya
3351e1c58d added python libs 2015-03-27 17:41:48 +05:30
Jayesh Kariya
38abae54d5 adding nftables unit test 2015-03-27 15:45:51 +05:30
Jayesh Kariya
08440ab1c9 adding publish unit test 2015-03-27 10:52:25 +05:30
Justin Findlay
2dd34ab6db restore explicit '-' in unit tests 2015-03-26 22:23:11 -06:00
Bo Maryniuk
d795c8d866 Test fix: pvcreate raises an exception if no device found 2015-03-26 17:45:46 +01:00
Rahul Handay
41f25642d1 Removed pylint errors 2015-03-26 12:48:17 +05:30
rahulha
430476e5a6 adding bluez unit test case 2015-03-26 11:30:16 +05:30
Colton Myers
b0fe5cc955 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/fileclient.py
    salt/minion.py
    tests/unit/pyobjects_test.py
2015-03-25 12:04:30 -06:00
Nicole Thomas
dcf8e68d7f Merge pull request #21976 from jayeshka/pam-unit-test
adding pam unit test
2015-03-25 08:34:36 -06:00
Jayesh Kariya
bb80e1d608 adding pam unit test 2015-03-25 13:46:11 +05:30
Jayesh Kariya
39e4b7f8e3 adding runit unit test 2015-03-25 11:14:18 +05:30
jfindlay
8e4bf33404 Merge pull request #21930 from ptonelli/develop
add hg_pillar similar to git_pillar
2015-03-24 13:10:53 -06:00
Alexander Pyatkin
fdb62788de Do not parse state name with pip in editable mode 2015-03-24 16:09:38 +00:00
Paul Tonelli
15f66d1f0f fix hg_pillar unittest lint errors 2015-03-24 15:52:13 +01:00
jfindlay
5b659c7999 Merge pull request #21925 from jfindlay/boto
fix tests for #21752
2015-03-23 21:01:05 -06:00
Justin Findlay
ebbb113f7a fix boto_vpc unit test and error message 2015-03-23 19:48:53 -06:00
Thomas S Hatch
0c4b281b82 Merge pull request #21915 from rallytime/pylint_develop
Python 3 compat fix for states/archive_test.py
2015-03-23 19:08:46 -06:00
rallytime
12aa7e1ff6 Python 3 compat fix for states/archive_test.py 2015-03-23 15:45:40 -06:00
Nicole Thomas
8ebf146b56 Revert "Python 3 compat fix for pylint" 2015-03-23 15:43:45 -06:00
rallytime
7bfa4ce70d Disable unused-import for py 3 compatibility 2015-03-23 10:47:03 -06:00
rallytime
e5e287cbb4 Pythong 3 compat fix for pylint 2015-03-23 10:03:56 -06:00
Jayesh Kariya
d27ab5c304 adding random_org unit test 2015-03-23 11:18:43 +05:30
Colton Myers
3c5f9af2d4 Lint (blank lines) 2015-03-21 15:36:04 -06:00
Evan Borgstrom
247d38d1da This fixes #21796
From the Python docs on the exec statement:

> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.

We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
2015-03-21 08:03:12 -07:00
Evan Borgstrom
3223a15f83 This fixes #21796
From the Python docs on the exec statement:

> Remember that at module level, globals and locals are the same dictionary.
> If two separate objects are given as globals and locals, the code will be
> executed as if it were embedded in a class definition.

We were providing a specific object for locals and in the specific case
reported in #21796 this caused a very strange name error when used in a
specific way. By removing the explicit locals dictionary and just having the
globals dictionary be shared fixes the issue, and we weren't using the
specific locals anyway.
2015-03-21 07:58:14 -07:00
Colton Myers
70406867a4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/client/__init__.py
    salt/modules/file.py
    salt/modules/yumpkg.py
    salt/modules/zypper.py
    tests/integration/shell/auth.py
    tests/unit/states/archive_test.py
    tests/unit/states/module_test.py
2015-03-20 20:09:19 -06:00
jfindlay
665cb94307 Merge pull request #21862 from jfindlay/keystone
adding keystone unit test
2015-03-20 15:39:32 -06:00
Justin Findlay
d838474cce add mock of keystoneclient module 2015-03-20 14:39:24 -06:00
Colton Myers
18ab3f8275 Is it the underscore of doom? 2015-03-20 13:06:16 -06:00
Colton Myers
d89d8f5d2d Add the trailing slash 2015-03-20 11:55:45 -06:00
Colton Myers
4eee083691 Reorder mocked arguments 2015-03-20 10:36:25 -06:00
Jayesh Kariya
8d44cc0713 resolved pylint error 2015-03-20 14:36:49 +05:30
Jayesh Kariya
66dad7defb adding keystone unit test 2015-03-20 11:10:30 +05:30
Colton Myers
d82d7645c9 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/modules/cmdmod.py
    salt/modules/debian_ip.py
    salt/modules/drac.py
    salt/modules/rpm.py
    salt/returners/postgres_local_cache.py
2015-03-19 16:13:16 -06:00
Colton Myers
2b1f400ab4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/topology/syndic.rst
    salt/client/__init__.py
    salt/daemons/masterapi.py
    salt/minion.py
    salt/modules/dockerio.py
2015-03-19 16:03:29 -06:00
Colton Myers
e386db2c34 Update syndic_config test for new cachedir 2015-03-19 11:33:09 -06:00
Nicolas Delaby
46011b2125 fix mocking 2015-03-19 16:56:12 +01:00
Colton Myers
04b2125581 Update syndic_config test for new cachedir 2015-03-18 15:17:39 -06:00
Thomas S Hatch
55a35c809d Merge pull request #21755 from jacksontj/2014.7
Add timeout to saltnado's event listener
2015-03-18 11:49:38 -06:00
Matthew Williams
69966fd838 fix lint 2015-03-18 16:31:05 +00:00
Matthew Williams
92e11a3539 add __context__ to boto_vpc test 2015-03-18 15:18:43 +00:00
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
Justin Findlay
f735f0b96d add eauth pam group tests
Adds test for #17380.
2015-03-17 14:25:57 -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
Thomas S Hatch
d8f1cffd10 Merge pull request #21649 from aspyatkin/htpasswd-enhancements
Make enhancements to htpasswd modules
2015-03-13 16:41:11 -06:00
Mike Place
baf2c40f88 More helper text, refactor filehandles, clean up 2015-03-13 16:15:23 -06:00
Mike Place
d04062a5ad Remove loop interval setting, was causing cpus to spin 2015-03-13 16:00:32 -06:00
Alexander Pyatkin
b23c0fa499 Make enhancements to htpasswd modules 2015-03-13 21:18:50 +00:00
Mike Place
56650f7e35 Include parser option for --no-tests 2015-03-13 13:18:54 -06: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
jfindlay
26acc5c1d4 Merge pull request #21518 from terminalmage/2015.2-develop
Merge 2015.2 into develop
2015-03-10 17:58:42 -06:00
jfindlay
c101f6fa87 Merge pull request #21513 from rallytime/fix_iptables_test
Just use nested with statements instead of \ continuation
2015-03-10 17:16:15 -06:00
Erik Johnson
d25677e954 Merge branch '2015.2' into 2015.2-develop 2015-03-10 17:47:30 -05:00
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
Thomas S Hatch
142424d1dd Merge pull request #21493 from thatch45/cro-committerparser
Merge #21455
2015-03-10 15:38:05 -06:00
Thomas S Hatch
8d75a9ff89 lint 2015-03-10 15:37:49 -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
Erik Johnson
d71e9de859 Fix test_envs fileserver runner test
The change in runner output behavior caused the output of test_envs to
change, causing some changes to need to be made in da163471 to get them
to pass. Now that runner output is fixed, the test was returning the
output it should have been in the first place. This commit changes that
test back so that it now expects a list as output.

Additionally, I've taken the opportunity to add additional test calls to
test the "backend" argument for those functions which now have it.
2015-03-10 11:28:59 -05:00
Thomas S Hatch
9bbe11eeb9 disable lint class inherit 2015-03-10 10:21:16 -06:00
Thomas S Hatch
296b8a660c lint 2015-03-10 10:17:33 -06:00
Thomas S Hatch
26fee96834 Merge branch 'committerparser' of https://github.com/cro/salt into cro-committerparser 2015-03-10 10:10:28 -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
C. R. Oldham
f587330576 Moar Python3 compatibility. 2015-03-09 17:16:47 -06:00
C. R. Oldham
ea70e82edf Add statistics by committer by month, from future import 2015-03-09 17:00:56 -06:00
Justin Findlay
7a49e3e877 fix test lint 2015-03-09 16:00:10 -06:00
C. R. Oldham
b95e5cd706 Add simple parser to return some activity numbers from our git log. 2015-03-09 15:57:30 -06:00
Justin Findlay
2c04a36efa fix iptables tests 2015-03-09 15:09:55 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
2015-03-09 12:52:14 -06:00
Colton Myers
8c1fa5358e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/modules/debian_ip.py
	salt/modules/file.py
	salt/states/ssh_auth.py
	salt/utils/cloud.py
2015-03-09 11:50:21 -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
Thomas S Hatch
0da8878b90 lint 2015-03-09 11:02:25 -06:00
Thomas S Hatch
d789f263c4 Merge branch 'cloud-gce-tests' of https://github.com/junckritter/salt into junckritter-cloud-gce-tests 2015-03-09 11:00:10 -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
Tomas Sirny
daf06c1ab6 Credit for test 2015-03-09 09:38:29 +01:00
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
Tomas Sirny
494d7069fd Working basic test for GCE cloud provider 2015-03-08 23:16:36 +01:00
Tomas Sirny
ee00477bae Template configs for GCE cloud provider 2015-03-08 16:44:14 +01:00
Thomas Jackson
7a5ac0245d Pylint fix 2015-03-06 17:47:18 -08:00
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
Viet Hung Nguyen
2a845989b7 bugfix: fix test mode in ssh_known_hosts
- present func: should not require key/fingerprint.
  In normal mode, key AND fingerprint can be omitted but
  test mode requires them, so fix the test mode to behave same
  way.
- absent function: return correct ret when change suppose to be made.
- refactor a bit.
2015-03-07 00:58:32 +07:00
Nicole Thomas
5ba6437c89 Merge pull request #21324 from rallytime/pylint_develop
Some pylint 3 compatibility fixes for develop
2015-03-06 10:52:31 -07: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
Thomas Jackson
9fa37fd46b Add raw boolean support to depends decorator 2015-03-05 21:59:10 -08: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
rallytime
d9d30cc855 Pylint fix 2015-03-05 10:31:13 -07:00
rallytime
dbdc12fe11 Python 3 compat for joyent integration test file 2015-03-04 16:11:45 -07: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
Justin Findlay
cfd03959d5 fix develop lint 2015-03-03 23:28:56 -07:00
Erik Johnson
0a077c14e3 Update test_valid_docs for nspawn compatibility funcs 2015-03-03 10:10:50 -07:00
Thomas S Hatch
17a76a8e86 Merge pull request #21083 from cachedout/request_test
Fix error in state.request
2015-03-03 10:00:14 -07:00
Jayesh Kariya
323c195bcc adding win_timezone unit test case 2015-03-03 18:46:53 +05:30
Justin Findlay
a6b86ef627 indent quoted code in cmdmod tests 2015-03-02 16:08:49 -07:00