Mike Place
845271d31c
More linting
2015-01-13 11:15:45 -07:00
Jayesh
d2a5eda14a
resolved pylint error
2015-01-13 17:54:45 +05:30
Jayesh
2aa6479d25
adding cpan test case
2015-01-13 15:56:21 +05:30
Thomas S Hatch
c368b88963
Merge pull request #19665 from cachedout/tornado_test_timeout
...
Fix tornado tests
2015-01-12 22:15:03 -07:00
Mike Place
74501f56ae
Fix tornado tests
...
The tornado test runner isn't respecting timeouts as it claims it
should in async mode. However, the env variable is working as-described.
2015-01-12 15:36:34 -07:00
Aurynn Shaw
b7ae48642a
Adds fire_master to the Salt Event library, for use in 3rd-party code.
2015-01-13 09:29:27 +13:00
Thomas S Hatch
b7899b2935
Merge pull request #19058 from cournape/add_darwin_pkg_support
...
Add darwin pkg support
2015-01-12 11:43:44 -07:00
Pedro Algarvio
eeb6dadc21
Merge branch '2015.2' into develop
2015-01-12 17:13:57 +00:00
Pedro Algarvio
0ceda58bd6
Fix mock call.
2015-01-12 16:51:02 +00:00
Pedro Algarvio
9e121e3317
Fix brew unit tests
2015-01-12 02:30:38 +00:00
Thomas S Hatch
cad85fd81b
Merge pull request #19583 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-01-09 17:49:43 -07:00
Thomas S Hatch
91d0b5b75c
Merge pull request #19562 from rupeshta/debconfmod_unit_tests
...
Implemented unit test cases for debconfmod module
2015-01-09 17:14:56 -07:00
Colton Myers
35596415b2
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/brew.py
salt/modules/disk.py
2015-01-09 12:57:49 -07:00
Nicole Thomas
e46ccc8210
Merge pull request #19579 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-09 12:51:48 -07:00
Colton Myers
3ce5eb2838
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/archive.py
salt/modules/brew.py
salt/modules/pip.py
tests/unit/modules/archive_test.py
tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
Mike Place
2ee4bead9e
Adjust for a possible subtle bug in zeromq
2015-01-09 11:10:02 -07:00
Mike Place
cc6c2828ab
Adjust for a possible subtle bug in zeromq
2015-01-09 11:08:39 -07:00
Rupesh Tare
84afffcb0a
Implemented unit test cases for debconfmod module
2015-01-09 17:05:13 +05:30
Thomas S Hatch
4ff285a002
Merge pull request #19511 from gracinet/19329-pillar-introspection
...
Provide modules.pillar.obfuscate and modules.pillar.ls
2015-01-08 16:56:53 -07:00
Thomas S Hatch
31f825d9f2
Merge pull request #19539 from terminalmage/fix-archive-tests
...
Update archive tests to use python_shell=False
2015-01-08 16:43:09 -07:00
Colton Myers
174290b7aa
Add python_shell=False to all the linux_acl mocks
2015-01-08 14:29:41 -07:00
Colton Myers
4f851c99ab
Fix gem tests
2015-01-08 14:26:04 -07:00
rallytime
a150447b15
pylint fix
2015-01-08 12:56:09 -07:00
rallytime
6f74048688
Fix blockdev module unit tests
2015-01-08 12:55:59 -07:00
Erik Johnson
ab23bf0332
Update archive tests to use python_shell=False
2015-01-08 13:51:47 -06:00
Thomas S Hatch
1e670f7b3e
Merge pull request #19478 from thatch45/qp_shell
...
shellisms for q and p modules
2015-01-08 11:54:44 -07:00
Colton Myers
4760dc0fb0
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-01-08 11:45:43 -07:00
Colton Myers
f31128bcc6
Merge pull request #19492 from basepi/shell01
...
Set python_shell=false
2015-01-08 11:45:29 -07:00
Colton Myers
a60fa6b3d1
Merge branch '2015.2' into develop
2015-01-08 11:29:08 -07:00
Colton Myers
d516dc07a2
Merge pull request #19487 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-01-08 11:28:20 -07:00
Colton Myers
522467f546
Fix gem failure
2015-01-08 10:42:55 -07:00
Mike Place
bb0c32e44d
Another missed quote
...
Conflicts:
tests/unit/modules/postgres_test.py
2015-01-08 10:17:39 -07:00
Mike Place
68b6815883
Another missed quote
2015-01-08 10:16:02 -07:00
Thomas S Hatch
792b0ba9c6
added the shell call to too many tests
2015-01-08 10:13:50 -07:00
Georges Racinet
e94fe6de31
Mark function as private
...
With the leading underscore, _obfuscate_inner should be excluded from the CLI
(and the related lint tests)
2015-01-08 17:41:49 +01:00
Colton Myers
e7b79de8da
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/ebuild.py
2015-01-08 09:28:12 -07:00
Georges Racinet
eb70dcf67d
Provide modules.pillar.obfuscate and modules.pillar.ls
...
This fulfills #19329 . As explained there, 'ls' is not that useful, but
still including it for completeness.
Also first attempt at writing a unit test within salt.
2015-01-08 09:44:51 +01:00
Mike Place
96fdbc474a
Fix postgres test
2015-01-07 22:38:51 -07:00
rallytime
8bf6edcf45
Merge branch '2015.2' into merge_forward_develop
2015-01-07 21:08:40 -07:00
rallytime
4aa60ce51a
Fix linux_acl tests
2015-01-07 20:55:19 -07:00
Erik Johnson
5edba8e55e
Add back double-quote
...
This is in the actual dig output, I shouldn't have removed it.
2015-01-07 20:05:43 -06:00
Erik Johnson
98e2e33338
Fix dig tests
...
This fixes the dig tests after dig.py was modified to use
python_shell=False.
2015-01-07 19:59:16 -06:00
rallytime
74a1861655
Merge branch '2015.2' into merge_forward_develop
2015-01-07 17:01:25 -07:00
Mike Place
3830162952
Some expressions are not so regular
2015-01-07 15:53:07 -07:00
Thomas S Hatch
0e1683672f
first round of pip test updates
2015-01-07 14:54:36 -07:00
Colton Myers
70489c62a7
Merge branch '2014.7' into merge-forward-2015.2
...
Conflicts:
salt/modules/cron.py
salt/modules/rabbitmq.py
salt/modules/smf.py
salt/modules/upstart.py
salt/modules/useradd.py
salt/modules/zpool.py
salt/pillar/git_pillar.py
2015-01-07 14:49:58 -07:00
Justin Findlay
d8785de0fd
fix uwsgi test
2015-01-07 11:57:44 -07:00
Thomas S Hatch
c9b003ac66
Merge pull request #19445 from rupeshta/devmap_unit_tests
...
Implemented unit test cases devmap module
2015-01-07 10:21:12 -07:00
Thomas S Hatch
f5572a3308
Merge pull request #19443 from rupeshta/bridge_unit_tests
...
Implemented unit test cases for bridge module
2015-01-07 10:20:17 -07:00
Thomas S Hatch
48097d7fed
Merge pull request #19442 from rupeshta/daemontools_unit_tests
...
Implemented unit test cases for module daemontools
2015-01-07 10:20:02 -07:00
