Commit Graph

506 Commits

Author SHA1 Message Date
Justin Findlay
e243617659 Merge pull request #24023 from jayeshka/mongodb_database-states-unit-test
adding states/mongodb_database unit test case
2015-05-21 10:49:17 -06:00
Jayesh Kariya
d038b1fdbb adding states/mongodb_user unit test case 2015-05-21 17:11:46 +05:30
Jayesh Kariya
5a9ac7effb adding states/mongodb_database unit test case 2015-05-21 17:09:20 +05:30
Jayesh Kariya
05c0a985db adding states/modjk_worker unit test case 2015-05-21 17:07:01 +05:30
Nicolas Delaby
5f8f24b655 Related to #23975 and apply same logic for ports and port_bindings 2015-05-21 09:49:21 +02:00
Nicole Thomas
b39e2d950d Merge pull request #23975 from terminalmage/fix-docker-volumes
Check for VOLUME lines in image
2015-05-20 13:59:04 -06:00
Erik Johnson
8ad8b527b6 Update test to mock dockerng.history 2015-05-20 13:54:20 -05:00
Colton Myers
9dbafcc051 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/tls.py
2015-05-20 11:59:59 -06:00
Justin Findlay
38d5f75756 Merge pull request #23967 from jayeshka/memcached-states-unit-test
adding states/memcached unit test case
2015-05-20 11:12:26 -06:00
Jayesh Kariya
422a96497d adding states/modjk unit test case 2015-05-20 15:31:46 +05:30
Jayesh Kariya
8ef9240e25 adding states/memcached unit test case 2015-05-20 15:30:45 +05:30
Justin Findlay
f09b80a8b5 augeas.change state now returns changes as a dict 2015-05-19 21:10:11 -06:00
Thomas S Hatch
e97a9c4e93 Merge pull request #23851 from ticosax/fix-volumes
[dockerng] fix mounting
2015-05-19 09:47:55 -06:00
rallytime
f45c7bdfca Add boilerplate unit test pieces to new dockerng_test file
Also fixes pylint errors in original PR.

Refs #23851
2015-05-18 13:04:14 -06:00
Colton Myers
6530a20340 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    pkg/suse/salt.changes
    salt/modules/lxc.py
    salt/modules/ps.py
    salt/states/cloud.py
2015-05-18 11:39:43 -06:00
Justin Findlay
433f87372c Merge pull request #23863 from rahulhan/states_timezone_unit_test
Adding states/timezone.py unit test
2015-05-18 11:02:19 -06:00
Justin Findlay
37b3ee5421 Merge pull request #23862 from rahulhan/states_tomcat_unit_test
Adding states/tomcat.py unit tests
2015-05-18 11:02:10 -06:00
Justin Findlay
dde7207acb Merge pull request #23860 from rahulhan/states_test_unit_test
Adding states/test.py unit tests
2015-05-18 11:01:49 -06:00
Rahul Handay
72fcabc690 Adding states/timezone.py unit test 2015-05-18 21:25:03 +05:30
Rahul Handay
65d7752d2a Adding states/tomcat.py unit tests 2015-05-18 21:22:46 +05:30
Rahul Handay
1f4cf86500 Adding states/test.py unit tests 2015-05-18 21:18:47 +05:30
Rahul Handay
6a903b054d Adding states/sysrc.py unit tests 2015-05-18 21:04:03 +05:30
Nicolas Delaby
df48ac2b91 volumes path, on create, should be the one inside the container
not from the host
2015-05-18 14:30:44 +02:00
Justin Findlay
a2e23fd162 Merge pull request #23716 from makinacorpus/i23713
Correct detect service toggling
2015-05-16 11:00:44 -06:00
Mathieu Le Marec - Pasquet
e26885d8cb lint 2015-05-16 14:21:17 +02:00
Mathieu Le Marec - Pasquet
bde7867c98 service/{dead/running} optimizations & test fixes
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-16 13:33:34 +02:00
Colton Myers
4ea3f8f80a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/pillar/neutron.py
    salt/utils/http.py
2015-05-15 13:43:40 -06:00
Jayesh Kariya
26e31afa31 adding states/makeconf unit test case 2015-05-15 17:37:53 +05:30
Colton Myers
7d8038f134 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    debian/changelog
    salt/modules/win_pkg.py
    salt/pillar/__init__.py
    salt/states/file.py
2015-05-14 10:27:00 -06:00
Rahul Handay
aad27db513 Adding states/user.py unit tests 2015-05-14 21:28:37 +05:30
Justin Findlay
13facbf077 Merge pull request #23704 from jayeshka/lvs_server_states-unit-test
adding states/lvs_server unit test case
2015-05-14 08:22:10 -06:00
Jayesh Kariya
da323dab0b adding states/lvs_server unit test case 2015-05-14 14:54:29 +05:30
Jayesh Kariya
66717c8133 adding states/lvs_service unit test case 2015-05-14 14:53:26 +05:30
Colton Myers
5ee7f25ee4 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-13 11:50:33 -06:00
Nicole Thomas
ee43411677 Merge pull request #23649 from jayeshka/libvirt_states-unit-test
adding states/libvirt unit test case
2015-05-13 09:24:48 -06:00
Nicole Thomas
c7fc466f1e Merge pull request #23648 from jayeshka/linux_acl_states-unit-test
adding states/linux_acl unit test case
2015-05-13 09:24:11 -06:00
Jayesh Kariya
3f0ab29eb0 removed error. 2015-05-13 18:02:35 +05:30
Jayesh Kariya
11081c121c adding states/linux_acl unit test case 2015-05-13 17:12:28 +05:30
Jayesh Kariya
0fb923a283 adding states/libvirt unit test case 2015-05-13 17:11:09 +05:30
Jayesh Kariya
1987015033 adding states/kmod unit test case 2015-05-13 17:09:57 +05:30
Colton Myers
eca368a0ee Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-12 16:09:12 -06:00
Justin Findlay
d4f30955fa Merge pull request #23598 from rahulhan/states_win_dns_client_unit_test
Adding states/win_dns_client.py unit tests
2015-05-12 15:47:36 -06:00
Justin Findlay
811c6a1d89 Merge pull request #23597 from rahulhan/states_vbox_guest_unit_test
Adding states/vbox_guest.py unit tests
2015-05-12 15:46:30 -06:00
Nicole Thomas
b8589532d1 Merge pull request #23603 from rahulhan/states_winrepo_unit_test
Adding states/winrepo.py unit tests
2015-05-12 12:40:12 -06:00
Nicole Thomas
3cbbd6d277 Merge pull request #23602 from rahulhan/states_win_path_unit_test
Adding states/win_path.py unit tests
2015-05-12 12:39:37 -06:00
Nicole Thomas
3c904e8739 Merge pull request #23600 from rahulhan/states_win_network_unit_test
Adding states/win_network.py unit tests
2015-05-12 12:39:01 -06:00
Rahul Handay
6a2909eeea Removed errors 2015-05-12 23:20:36 +05:30
Rahul Handay
b418404eb7 removed lint error 2015-05-12 23:06:20 +05:30
Rahul Handay
a66e7e7f1f Adding states/winrepo.py unit tests 2015-05-12 22:54:54 +05:30
Rahul Handay
122c29f71a Adding states/win_path.py unit tests 2015-05-12 22:50:02 +05:30
Rahul Handay
1be802300b Adding states/win_network.py unit tests 2015-05-12 22:45:25 +05:30
Rahul Handay
6cda890517 Adding win_firewall.py unit tests 2015-05-12 22:39:09 +05:30
Rahul Handay
d08d885828 Adding states/win_dns_client.py unit tests 2015-05-12 22:34:31 +05:30
Rahul Handay
4cde78a58a Adding states/vbox_guest.py unit tests 2015-05-12 22:31:03 +05:30
Nicole Thomas
d2f097584c Merge pull request #23583 from jayeshka/ipset_states-unit-test
adding states/ipset unit test case
2015-05-12 10:31:55 -06:00
Nicole Thomas
82a47e8cbf Merge pull request #23582 from jayeshka/keyboard_states-unit-test
adding states/keyboard unit test case
2015-05-12 10:31:17 -06:00
Daniel Hobley
30d8be877d Lint fixes 2015-05-12 15:48:53 +02:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions
- Allows you to set power settings on a windows minion for things like the monitor and disk
2015-05-12 14:49:48 +02:00
Jayesh Kariya
297b055b1c adding states/layman unit test case 2015-05-12 18:05:35 +05:30
Jayesh Kariya
fa94d7ab5c adding states/keyboard unit test case 2015-05-12 18:04:26 +05:30
Jayesh Kariya
4330cf4a6e adding states/ipset unit test case 2015-05-12 18:03:14 +05:30
Colton Myers
1d77ae9072 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/modules/hipchat.py
    salt/modules/random_org.py
    salt/modules/serverdensity_device.py
    salt/modules/slack_notify.py
    salt/returners/__init__.py
    salt/states/iptables.py
2015-05-11 11:38:03 -06:00
Rahul Handay
750bb07d1c Adding states/virtualenv_mod.py unit tests 2015-05-11 21:49:59 +05:30
Justin Findlay
4e77f6f8c4 Merge pull request #23534 from jayeshka/ini_manage_states-unit-test
adding states/ini_manage unit test case
2015-05-11 08:32:06 -06:00
Justin Findlay
11ba9ed99b Merge pull request #23533 from jayeshka/hipchat-states-unit-test
adding states/hipchat unit test case
2015-05-11 08:30:22 -06:00
Jayesh Kariya
831223c31c adding states/ini_manage unit test case 2015-05-11 18:07:02 +05:30
Jayesh Kariya
fc3e64a8a4 adding states/ipmi unit test case 2015-05-11 17:59:54 +05:30
Jayesh Kariya
41d14b322d adding states/hipchat unit test case 2015-05-11 17:57:06 +05:30
Rahul Handay
2490074aa2 Adding states/win_servermanager.py unit tests 2015-05-08 23:59:58 +05:30
Justin Findlay
b981b20d44 Merge pull request #23493 from jayeshka/incron-states-unit-test
adding states/incron unit test case
2015-05-08 11:29:59 -06:00
Justin Findlay
4019c493a1 Merge pull request #23492 from jayeshka/influxdb_database-states-unit-test
adding states/influxdb_database unit test case
2015-05-08 11:29:51 -06:00
Jayesh Kariya
9d4043f9ff adding states/influxdb_user unit test case 2015-05-08 16:21:17 +05:30
Jayesh Kariya
e1fcac815d adding states/influxdb_database unit test case 2015-05-08 16:16:24 +05:30
Jayesh Kariya
cc7bc170f3 adding states/incron unit test case 2015-05-08 16:15:06 +05:30
Justin Findlay
ea55c44bbb Merge pull request #23468 from rahulhan/states_win_system_unit_test
Adding states/win_system.py unit tests
2015-05-07 13:20:50 -06:00
Justin Findlay
49b431c8e4 Merge pull request #23448 from jayeshka/keystone-states-unit-test
adding states/keystone unit test case
2015-05-07 12:58:59 -06:00
Rahul Handay
33f8c12e9f Adding states/win_system.py unit tests 2015-05-07 23:59:13 +05:30
Jayesh Kariya
a3050eb3e2 adding states/keystone unit test case 2015-05-07 15:15:47 +05:30
Jayesh Kariya
7e90a4aaca adding states/grafana unit test case 2015-05-07 15:14:16 +05:30
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Colton Myers
56d382a093 Fix xmpp test 2015-05-06 14:40:46 -06:00
Rahul Handay
9bc1519ee7 Removed unwanted imports 2015-05-06 21:54:37 +05:30
Rahul Handay
f12bfcf248 Adding states/win_update.py unit tests 2015-05-06 21:45:41 +05:30
Jayesh Kariya
32a0d03093 adding states/lxc unit test case 2015-05-06 17:29:53 +05:30
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Justin Findlay
5c9543c1d2 Merge pull request #23379 from rahulhan/states_rabbitmq_cluster_test
Adding states/rabbitmq_cluster.py
2015-05-05 15:44:06 -06:00
Justin Findlay
430f080a3a Merge pull request #23377 from rahulhan/states_xmpp_test
Adding states/xmpp.py unit tests
2015-05-05 15:43:35 -06:00
Rahul Handay
04c22d1acf Adding states/rabbitmq_cluster.py 2015-05-05 20:57:08 +05:30
Rahul Handay
32923b53c3 Adding states/xmpp.py unit tests 2015-05-05 20:50:20 +05:30
Nicole Thomas
dcfdbf189d Merge pull request #23249 from lyft/boto-iam-assume-role-support
Support for assumed role policies and roles without instance profiles
2015-05-05 09:20:15 -06:00
Jayesh Kariya
f60dda4b1d adding states/zk_concurrency unit test case 2015-05-05 15:37:35 +05:30
Ryan Lane
538f8f033b Fix lint error 2015-05-04 23:03:58 -07:00
Ryan Lane
a0ee7cb225 Fix unit tests and add coverage for new functions. 2015-05-04 19:31:59 -07:00
Justin Findlay
004dfe8056 Merge pull request #23320 from jayeshka/gnomedesktop-states-unit-test
adding states/gnomedesktop unit test case
2015-05-04 08:58:37 -06:00
Jayesh Kariya
f441e232e2 adding states/gnomedesktop unit test case 2015-05-04 16:10:54 +05:30
Jayesh Kariya
b8a8b52f1d adding states/glusterfs unit test case 2015-05-04 16:09:41 +05:30
Colton Myers
94ea3b7357 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-04-30 14:23:05 -06:00
Thomas S Hatch
6e18810745 Merge pull request #23209 from jayeshka/disk-states-unit-test
adding states/disk unit test case
2015-04-30 08:30:43 -07:00
Thomas S Hatch
6a1e86efce Merge pull request #23208 from jayeshka/eselect-states-unit-test
adding states/eselect unit test case
2015-04-30 08:30:33 -07:00
Thomas S Hatch
6016e00eaf Merge pull request #23207 from jayeshka/drac-states-unit-test
adding states/drac unit test case
2015-04-30 08:30:18 -07:00
Thomas S Hatch
365c16b901 Merge pull request #23206 from jayeshka/composer-states-unit-test
adding states/composer unit test case
2015-04-30 08:30:02 -07:00
Thomas S Hatch
9360af2afc Merge pull request #23205 from jayeshka/debconfmod-states-unit-test
adding states/debconfmod unit test case
2015-04-30 08:29:46 -07:00
Jayesh Kariya
c64a939446 adding states/eselect unit test case 2015-04-30 15:49:02 +05:30
Jayesh Kariya
b4b027c547 adding states/drac unit test case 2015-04-30 15:47:53 +05:30
Jayesh Kariya
946872e87f adding states/disk unit test case 2015-04-30 15:46:39 +05:30
Jayesh Kariya
0e5f4a7087 adding states/debconfmod unit test case 2015-04-30 15:44:29 +05:30
Jayesh Kariya
818aab8a6f adding states/ddns unit test case 2015-04-30 15:43:17 +05:30
Jayesh Kariya
05ff008741 adding states/composer unit test case 2015-04-30 15:41:45 +05:30
Justin Findlay
d935b996e7 fix cmd_test for develop branch 2015-04-29 15:00:56 -06:00
Colton Myers
cca8ddc886 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    .pylintrc
    .testing.pylintrc
    salt/auth/pam.py
    salt/modules/win_status.py
    salt/utils/network.py
    salt/utils/schedule.py
    tests/unit/renderers/gpg_test.py
    tests/unit/states/boto_secgroup.py
2015-04-29 12:01:52 -06:00
Jayesh Kariya
526383deaa adding states/cmd unit test case 2015-04-29 17:31:23 +05:30
Matthew Williams
e32976b4b6 Merge remote-tracking branch 'origin/develop' into boto_dicts 2015-04-28 21:40:40 +00:00
Matthew Williams
63cc88ed64 states.boto_vpc: use separate subnet_ids and subnet_names kwargs in route_table_present 2015-04-28 21:37:05 +00:00
Mike Place
373586576d Merge pull request #23062 from mgwilliams/boto_dicts
return dicts from all boto_vpc functions
2015-04-28 14:25:59 -06:00
Mike Place
b4bf7763e3 Merge pull request #23059 from s0undt3ch/features/py-min-version-lint
Start checking code to enforce a minimum python version support
2015-04-28 14:05:23 -06:00
Jayesh Kariya
03ac21072d adding states/cloud unit test case 2015-04-28 09:45:52 -06:00
Matthew Williams
796fd603e8 use Mixin for Subnets test case in boto_vpc state module tests 2015-04-27 16:56:07 +00:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
Matthew Williams
76f739d7c7 boto_vpc: lint 2015-04-27 16:05:55 +00:00
Justin Findlay
7daffb11f0 Merge pull request #23083 from jayeshka/chef-states-unit-test
adding states/chef unit test case
2015-04-27 09:29:02 -06:00
Justin Findlay
846f8b7ffb Merge pull request #23082 from jayeshka/boto_sqs-states-unit-test
adding states/boto_sqs unit test case
2015-04-27 09:26:25 -06:00
Justin Findlay
fc6ca0c117 Merge pull request #23081 from jayeshka/boto_sns-states-unit-test
adding states/boto_sns unit test case
2015-04-27 09:25:57 -06:00
Justin Findlay
ba9f6fb2a7 Merge pull request #23080 from jayeshka/boto_route53-states-unit-test
adding states/boto_route53 unit test case
2015-04-27 09:25:29 -06:00
Jayesh Kariya
13a4cd8a30 adding states/chef unit test case 2015-04-27 17:08:56 +05:30
Jayesh Kariya
7a34457405 adding states/boto_sqs unit test case 2015-04-27 17:07:06 +05:30
Jayesh Kariya
82c5d1f68b adding states/boto_sns unit test case 2015-04-27 17:05:34 +05:30
Jayesh Kariya
64adc959b1 adding states/boto_route53 unit test case 2015-04-27 17:03:33 +05:30
Jayesh Kariya
23cc26a1a8 adding states/boto_lc unit test case 2015-04-27 17:01:26 +05:30
Matthew Williams
6752c810be add additional tests for boto_vpc state 2015-04-27 06:08:08 +00:00
Pedro Algarvio
c5a34176e5 Fix imports 2015-04-26 10:53:36 +01:00
Matthew Williams
bd40be4b02 Merge branch 'develop' into boto_dicts 2015-04-25 18:29:13 +00:00
Matthew Williams
899427a7be boto_vpc: lint 2015-04-25 17:33:16 +00:00
Matthew Williams
e6a02a65ea WIP: states.boto_vpc: sync with execution module changes 2015-04-25 17:26:43 +00:00
Justin Findlay
6efef05d27 Merge pull request #23036 from jfindlay/merge_23017
adding states/boto_elasticache unit test
2015-04-24 13:47:27 -06:00
Jayesh Kariya
06979ca744 adding states/boto_elb unit test 2015-04-24 12:07:41 -06:00
Jayesh Kariya
eda40c4b33 adding states/boto_elasticache unit test 2015-04-24 12:05:24 -06:00
Colton Myers
313c46501d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/auth/pam.py
    salt/modules/boto_route53.py
    salt/state.py
2015-04-24 10:19:03 -06:00
Jayesh Kariya
93214d0441 adding states/boto_iam_role unit test case 2015-04-24 17:21:28 +05:30
Colton Myers
035ad549d5 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/modules/schedule.py
    salt/utils/schedule.py
2015-04-23 13:00:35 -06:00
Nicole Thomas
cf9041744a Merge pull request #22985 from jfindlay/apache_state_test
fix failing apache state unit test
2015-04-23 09:18:23 -06:00
Justin Findlay
10fa7eea14 Merge pull request #22980 from jayeshka/boto_elb-states-unit-test
Boto elb states unit test
2015-04-23 08:16:44 -06:00
Justin Findlay
34453b314e fix failing apache state unit test 2015-04-23 08:09:15 -06:00
Jayesh Kariya
d347bb4e3b changes as per 2015.2 branch 2015-04-23 17:58:08 +05:30
Jayesh Kariya
06bf61822d changes as per 2015.2 branch 2015-04-23 17:56:04 +05:30
Jayesh Kariya
6ef51d1b2d adding states/boto_elb unit test case 2015-04-23 17:29:19 +05:30
Jayesh Kariya
2c03692d04 adding states/boto_elasticache unit test case 2015-04-23 17:27:28 +05:30
Jayesh Kariya
ed5f483bb4 adding states/boto_ec2 unit test case 2015-04-22 16:46:39 -06:00
Colton Myers
1a38b4b834 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/cli/salt.py
    salt/client/mixins.py
    salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
Justin Findlay
a70fa267b1 Merge pull request #22936 from jayeshka/boto_dynamodb-states-unit-test
adding states/boto_dynamodb unit test case
2015-04-22 08:49:52 -06:00
Justin Findlay
ce1a880025 Merge pull request #22935 from jayeshka/boto_cloudwatch_alarm-states-unit-test
adding states/boto_cloudwatch_alarm unit test case
2015-04-22 08:48:19 -06:00
Jayesh Kariya
650435ec44 adding states/boto_dynamodb unit test case 2015-04-22 16:17:29 +05:30
Jayesh Kariya
4e5a101647 adding states/boto_cloudwatch_alarm unit test case 2015-04-22 16:15:54 +05:30
Jayesh Kariya
f78374e34a adding states/boto_asg unit test case 2015-04-22 16:13:14 +05:30
rallytime
cac386247c Skip the network state unit tests if sustem is on Python 2.6
These tests need to be refactored to be able to run on Python 2.6
2015-04-21 14:13:58 -06:00
Colton Myers
bd6ecdfd43 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/gitfs.rst
    salt/pillar/pepa.py
    salt/states/artifactory.py
    salt/states/pip_state.py
    salt/transport/__init__.py
2015-04-21 10:42:22 -06:00
Nicole Thomas
f7ccbac1f2 Merge pull request #22884 from jfindlay/merge_22847
Merge 22847
2015-04-21 10:15:31 -06:00
Justin Findlay
3640fa59bc Merge pull request #22889 from jayeshka/blockdev-states-unit-test
adding states/blockdev unit test case
2015-04-21 08:48:06 -06:00
Justin Findlay
7899914dbe fix deprecated artifactory state code 2015-04-21 08:38:23 -06:00
Jayesh Kariya
4aac4904b4 adding states/blockdev unit test case 2015-04-21 17:32:30 +05:30
Jayesh Kariya
7674fee99f adding states/aws_sqs unit test case 2015-04-21 17:30:48 +05:30
Justin Findlay
7fe3efa0f9 Merge pull request #22848 from jayeshka/apache-states-unit-test
adding states/apache unit test case
2015-04-20 21:44:42 -06:00
Justin Findlay
15e869d540 Merge pull request #22849 from jayeshka/apt-states-unit-test
adding states/apt unit test case
2015-04-20 21:44:15 -06:00
Justin Findlay
42761ee346 Merge pull request #22846 from jayeshka/at-states-unit-test
adding states/at unit test case
2015-04-20 21:33:28 -06:00
Colton Myers
ef583295d5 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/beacons/service.py
2015-04-20 11:41:25 -06:00
Matthew Williams
97bd79dd0e Merge remote-tracking branch 'origin/develop' into boto_dicts 2015-04-20 15:10:51 +00:00
Matthew Williams
5dbba08c04 states.boto_vpc: sync vpc.present/absent and subnet.present/absent with execution module; add tests 2015-04-20 15:09:46 +00:00
Jayesh Kariya
446121750d adding states/artifactory unit test case 2015-04-20 16:02:46 +05:30
Jayesh Kariya
58ffc0c756 adding states/augeas unit test case 2015-04-20 16:01:10 +05:30
Jayesh Kariya
be7e2e9202 adding states/at unit test case 2015-04-20 15:59:27 +05:30
Jayesh Kariya
e06343bc18 adding states/apt unit test case 2015-04-20 15:57:54 +05:30
Jayesh Kariya
619dd5cce8 adding states/apache unit test case 2015-04-20 15:56:31 +05:30
Nicole Thomas
3049183f07 Merge pull request #22775 from jayeshka/alternatives-states-unit-test
adding states/alternatives unit test case
2015-04-17 13:18:30 -06:00
rallytime
1e4b93dec9 Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
Jayesh Kariya
f5bb21cd3e adding states/apache_module unit test case 2015-04-17 17:28:54 +05:30
Jayesh Kariya
283899e939 adding states/alternatives unit test case 2015-04-17 15:26:36 +05:30
Justin Findlay
c82339ba74 fix saltmod.function unit test 2015-04-16 21:09:59 -06:00
Colton Myers
728e74c921 Better return data for mocked saltutil.cmd for saltmod.function 2015-04-16 17:46:32 -06:00
Colton Myers
fd036278e8 Fix iptables test_flush 2015-04-16 17:18:50 -06:00
Justin Findlay
cf94017d88 fix saltmod.function unit test 2015-04-16 14:41:46 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Nicole Thomas
1bb93d29af Merge pull request #22660 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-16 10:00:11 -06:00
Justin Findlay
bacbf6cfa5 Merge pull request #22741 from jayeshka/lvm-states-unit-test
adding states/lvm test case
2015-04-16 07:20:10 -06:00
Jayesh Kariya
a32da0c8df adding states/lvm test case 2015-04-16 17:09:26 +05:30
Rahul Handay
2a977cada7 Adding states/network.py unit tests 2015-04-16 16:19:21 +05:30
Justin Findlay
e6b6ee8ce5 Merge pull request #22706 from rahulhan/states_nftables_unit_tests
Adding states/nftables.py unit test cases
2015-04-15 10:29:23 -06:00
Rahul Handay
d3e25ff4ae Adding states/nftables.py unit test cases 2015-04-15 18:55:21 +05:30
Rahul Handay
e6b6c41785 Adding states/iptables.py unit tests 2015-04-15 17:15:23 +05:30
Colton Myers
f1ba391624 Trailing slash 2015-04-14 17:23:06 -06:00
Colton Myers
e0c212866b Missing trailing underscore for test 2015-04-14 12:59:27 -06:00
Nicole Thomas
4f5986cc0d Merge pull request #22652 from rahulhan/states_group_unit_tests
Adding states/group.py unit test cases
2015-04-14 12:46:41 -06:00
Colton Myers
9099884809 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/cloud/config.rst
    salt/modules/win_disk.py
    salt/modules/yumpkg.py
    salt/pillar/s3.py
    salt/states/service.py
    salt/utils/event.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/netapi/test_client.py
    tests/unit/states/archive_test.py
2015-04-14 11:03:03 -06:00
Justin Findlay
d21d360b04 Merge pull request #22642 from rahulhan/states_mdadm_unit_tests
Adding states/mdadm.py unit test cases
2015-04-14 08:45:55 -06:00
Justin Findlay
a7e55d6c1c Merge pull request #22641 from rahulhan/states_locale_unit_tests
Adding states/locale.py unit test cases
2015-04-14 08:45:24 -06:00
Justin Findlay
25fedf5e83 Merge pull request #22637 from jayeshka/saltmod-states-unit-test
adding states/saltmod unit test case.
2015-04-14 08:42:24 -06:00
Rahul Handay
b61c3ea15e Adding states/group.py unit test cases 2015-04-14 19:12:49 +05:30
Rahul Handay
8bbb9e010c Adding states/mdadm.py unit test cases 2015-04-14 16:04:26 +05:30
Rahul Handay
febc12e6b4 Adding states/locale.py unit test cases 2015-04-14 16:02:30 +05:30
Jayesh Kariya
0f6fbf66d7 adding states/saltmod unit test case. 2015-04-14 14:30:58 +05:30
Rahul Handay
7f73bdd523 Adding states/service.py unit test cases 2015-04-14 12:35:50 +05:30
Pedro Algarvio
1181a50d0d Don't assume we're running the tests as root 2015-04-10 00:52:32 +01:00