valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
50,469 Commits 24 Branches 182 Tags 341 MiB
d21e180a5a
Commit Graph

4447 Commits

Author SHA1 Message Date
Jayesh Kariya
6ff102281d removed error for CentOS 2015-04-01 15:41:25 +05:30
Rahul Handay
c50b842c66 Adding systemd.py unit tests 2015-04-01 14:59:16 +05:30
Jayesh Kariya
7e920e1d3b adding rh_service unit test 2015-04-01 11:38:47 +05:30
Rahul Handay
7ef848edc1 Adding Reg.py unit test cases 2015-04-01 11:14:27 +05:30
Thomas S Hatch
a03efac22c Merge pull request #22188 from claudiupopescu/vpc_subnet_features 
Boto VPC subnet state
 2015-03-31 12:05:44 -06:00
Thomas S Hatch
8efac4c8a2 Merge pull request #22186 from rahulhan/saltcloudmod_unit_test 
Adding saltcloudmod.py unit test
 2015-03-31 12:05:10 -06:00
Colton Myers
ed51f2bb7c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-31 11:25:27 -06:00
Nicole Thomas
9412a83f2f Revert "adding rh_service unit test" 2015-03-31 09:42:47 -06:00
Nicole Thomas
44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-03-31 09:21:36 -06:00
Claudiu Popescu
5562422135 Test parameters for delete_subnet 2015-03-31 15:04:20 +02:00
Claudiu Popescu
573027569c Version and test fixes 2015-03-31 14:57:47 +02:00
Nicole Thomas
33727a5c32 Merge pull request #22190 from jayeshka/rh_service-unit-test 
adding rh_service unit test
 2015-03-31 06:48:36 -06:00
Nicole Thomas
7d47eded8b Merge pull request #22187 from jayeshka/sqlite3-unit-test 
adding sqlite3_test unit test
 2015-03-31 06:47:35 -06:00
Jayesh Kariya
0190f4ac63 adding rh_service unit test 2015-03-31 17:42:14 +05:30
rallytime
88298c5599 Add mock exception class to keystone unit test 
Fixes unit tests error for merge forward
 2015-03-31 05:56:55 -06:00
Nicole Thomas
0ea0f3d592 Revert "Adding state.py unit test" 2015-03-31 05:32:29 -06:00
Jayesh Kariya
bada2e22fa adding sqlite3_test unit test 2015-03-31 15:39:26 +05:30
Rahul Handay
0b7225ab89 Adding saltcloudmod.py unit test 2015-03-31 15:32:49 +05:30
jfindlay
7b95940d66 Merge pull request #22143 from rahulhan/state_unit_test 
Adding state.py unit test
 2015-03-30 23:53:36 -06:00
Thomas S Hatch
2b77267c4e Merge pull request #22091 from basepi/jinja.cmd.run 
[2015.2] Alias `cmd.run` to `cmd.shell` in templates (python_shell=True)
 2015-03-30 17:00:24 -06:00
Joshua Semar
a5b28ad24d fix tests return value 2015-03-30 16:42:19 -05:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
 2015-03-30 15:10:17 -06:00
Joshua Semar
95aa3518d5 fix cas behavior on data module 
data.cas was not saving changes.  We now call dump after
receiving the change
 2015-03-30 16:01:28 -05:00
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