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
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
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
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
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
