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
Thomas S Hatch
c79871e77d
Merge pull request #19637 from s0undt3ch/develop
...
Merge branch '2015.2' into develop
2015-01-12 11:33:14 -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
Pedro Algarvio
c3bc043b23
Merge branch '2015.2' into develop
...
Conflicts:
salt/syspaths.py
setup.py
tests/integration/__init__.py
2015-01-11 22:45:35 +00:00
Pedro Algarvio
9d0fe5b1d1
Merge branch '2014.7' into 2015.2
...
Conflicts:
salt/modules/brew.py
tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
Thomas Jackson
e35c7ac313
cleanup "Caste jid as str (its an int all over), and change runner tag to correct prefix"
...
This reverts most of commit 745f2d84835ae23800358cd4dcc9c8525b502714.
apparently I picked up some other changes I didn't mean to
Conflicts:
salt/utils/event.py
tests/integration/utils/test_reactor.py
2015-01-10 16:32:24 -08:00
Thomas Jackson
d352057f11
Pylint fix
2015-01-10 16:31:59 -08:00
Thomas Jackson
c17462d062
Caste jid as str (its an int all over), and change runner tag to correct prefix
2015-01-10 16:30:00 -08:00
Mike Place
0e935486de
Merge pull request #19605 from jacksontj/develop
...
Fixes for develop
2015-01-10 08:54:59 -07:00
Thomas Jackson
925afac98d
Temporarily change this test to work around race condition in the runnerclient
...
@rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)
2015-01-10 00:18:16 -08:00
Mike Place
1277b71e2d
Typo
2015-01-09 21:22:40 -07:00
Mike Place
7d4123c6b3
Async flag and test cleanup
2015-01-09 21:21:50 -07:00
Thomas S Hatch
98cc0f88b4
Merge pull request #19585 from cachedout/async_flag_for_test_run
...
Async flag for test run
2015-01-09 17:50:52 -07: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
Mike Place
7aec24e8e1
Typo
2015-01-09 13:26:25 -07:00
Mike Place
9d7990f264
Async flag and test cleanup
2015-01-09 13:14:33 -07:00
rallytime
d6b3f69c19
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 13:10:09 -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
Mike Place
1526d1e788
Merge pull request #19574 from rallytime/better_test_fix
...
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 11:39:42 -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
rallytime
28cb062697
Cleaner and actual fix for the failing weird pip test for CentOS 5
2015-01-09 10:52:55 -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
rallytime
ea769829af
Fix my pylint errors
2015-01-08 15:09:55 -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
41841701e7
Fix djangomod.py integration test failures
2015-01-08 12:57:11 -07:00
rallytime
2443d11282
Change file perms back to executable
2015-01-08 12:56:27 -07:00
rallytime
8eab15780e
Change file perms on runtests.py
2015-01-08 12:56:17 -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
Mike Place
ca9a871d43
Merge pull request #19536 from rallytime/pip_test_fix
...
Don't run weird pip install test on CentOS 5
2015-01-08 12:21:08 -07:00
rallytime
71ef3f7744
Keep package name the same
2015-01-08 12:13:26 -07:00
rallytime
a0f801f475
Skip this test when we are running on centOS 5
2015-01-08 12:11:51 -07: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
