Commit Graph

4214 Commits

Author SHA1 Message Date
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
Christophe Drevet-Droguet
c4954046ad unit tests for grains.append module function
- separate test functions for every return
- add tests for nested lists
- add test for appending to an element of a list (fails silently)
2015-05-10 17:27:32 +02:00
Christophe Drevet-Droguet
0c9a32326c use MagickMock 2015-05-09 18:34:02 +02:00
Christophe Drevet-Droguet
c838a22377 unit tests for grains.append module function 2015-05-08 21:01:36 +02:00
Rahul Handay
2490074aa2 Adding states/win_servermanager.py unit tests 2015-05-08 23:59:58 +05:30
Justin Findlay
604857811e Merge pull request #23495 from jayeshka/seed-unit-test
adding seed unit test case
2015-05-08 11:30:38 -06:00
Justin Findlay
70bc3c1415 Merge pull request #23494 from jayeshka/sensors-unit-test
adding sensors unit test case
2015-05-08 11:30:18 -06:00
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
Jayesh Kariya
1fb48a31a8 adding sensors unit test case 2015-05-08 16:11:20 +05:30
Jayesh Kariya
3f134bc573 adding seed unit test case 2015-05-08 16:10:00 +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
865127844a Merge pull request #23450 from jayeshka/scsi-unit-test
adding scsi unit test case
2015-05-07 13:00:28 -06:00
Justin Findlay
8b374ae64d Merge pull request #23449 from jayeshka/s3-unit-test
adding s3 unit test case
2015-05-07 12:59:45 -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
e7269ff29b adding scsi unit test case 2015-05-07 15:44:39 +05:30
Jayesh Kariya
85786bfe7f adding s3 unit test case 2015-05-07 15:43:32 +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
1fb84450f4 Merge pull request #23396 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-05-06 15:42:35 -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
Justin Findlay
02ef41a549 Merge pull request #23407 from jayeshka/rsync-unit-test
adding rsync unit test case
2015-05-06 09:52:23 -06:00
Jayesh Kariya
a4dd836125 adding rsync unit test case 2015-05-06 17:31:04 +05:30
Jayesh Kariya
32a0d03093 adding states/lxc unit test case 2015-05-06 17:29:53 +05:30
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
2015-05-05 16:26:39 -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
Justin Findlay
1648253675 Merge pull request #23362 from jayeshka/zk_concurrency-states-unit-test
adding states/zk_concurrency unit test case
2015-05-05 09:50:06 -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
Mike Place
e98e65e787 Fix tests 2015-05-05 08:20:41 -06:00
Jayesh Kariya
f9da6db459 adding riak unit test case 2015-05-05 15:39:52 +05:30
Jayesh Kariya
f60dda4b1d adding states/zk_concurrency unit test case 2015-05-05 15:37:35 +05:30
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
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
Colton Myers
21d9de2995 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    salt/fileclient.py
    salt/utils/serializers/yaml.py
2015-04-29 11:47:06 -06:00
Justin Findlay
2ad2840936 Merge pull request #23169 from jayeshka/rh_ip-unit-test
adding rh_ip unit test case
2015-04-29 09:20:19 -06:00
Jayesh Kariya
526383deaa adding states/cmd unit test case 2015-04-29 17:31:23 +05:30
Jayesh Kariya
636c654205 adding rh_ip unit test case 2015-04-29 17:29:37 +05:30
Justin Findlay
45153aafd8 Merge pull request #23143 from rallytime/bp-23124
Backport #23124 to 2015.2
2015-04-28 14:44:42 -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
Justin Findlay
ffd18493e8 compare OrderedDicts in serializer unit test 2015-04-28 13:30:16 -06:00
Kevin Boulain
a9777c6167 fix tests for the parted module 2015-04-28 13:22:54 -06:00
Justin Findlay
65e1d0bd91 Merge pull request #23137 from jfindlay/merge_23126
adding states/cloud unit test case
2015-04-28 12:01:45 -06:00
Jayesh Kariya
03ac21072d adding states/cloud unit test case 2015-04-28 09:45:52 -06:00
Justin Findlay
3df2a8e88d Merge pull request #23128 from jayeshka/rest_service-unit-test
adding rest_service unit test case
2015-04-28 08:16:54 -06:00
Jayesh Kariya
975ea49808 adding rest_service unit test case 2015-04-28 18:06:55 +05:30
Jayesh Kariya
4b7be9ffb8 adding rest_package unit test case 2015-04-28 18:04:43 +05:30
Justin Findlay
bcad307c38 Merge pull request #23084 from jayeshka/rbenv-unit-test
adding rbenv unit test case
2015-04-27 09:29:54 -06: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
a96e914a08 adding rbenv unit test case 2015-04-27 17:26:24 +05:30
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
Pedro Algarvio
a96fb2ae73 Add required white-space 2015-04-27 09:11:29 +01:00
Pedro Algarvio
70810daba2 Some minimum-python-version PyLint disables 2015-04-26 10:57:59 +01:00
Pedro Algarvio
c5a34176e5 Fix imports 2015-04-26 10:53:36 +01:00
Pedro Algarvio
51dba5c24b Use Salt's OrderedDict which always exists 2015-04-26 10:51:28 +01:00
rallytime
8d5b50e17c Don't forget the blank lines at the end of the file 2015-04-24 16:29:51 -06:00
rallytime
9830708f86 Some small test clean up changes 2015-04-24 16:27:22 -06:00
Justin Findlay
f9bdf6347d Merge pull request #23019 from jayeshka/boto_iam_role-states-unit-test
adding states/boto_iam_role unit test case
2015-04-24 08:42:51 -06:00
Jayesh Kariya
49894795ad adding raet_publish unit test case 2015-04-24 17:30:24 +05:30
Jayesh Kariya
93214d0441 adding states/boto_iam_role unit test case 2015-04-24 17:21:28 +05:30
Nicole Thomas
1d9230cb8f Merge pull request #22952 from basepi/merge-forward-2015.2
[2015.2] Merge forward from 2014.7 to 2015.2
2015-04-23 15:56:44 -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
340dba3210 Merge pull request #22982 from jayeshka/qemu_img-unit-test
adding qemu_img unit test case
2015-04-23 08:18:46 -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
b9188aea6a adding qemu_img unit test case 2015-04-23 18:13:27 +05:30
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
Colton Myers
63119f9505 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    salt/modules/dockerio.py
    salt/modules/localemod.py
    salt/modules/useradd.py
2015-04-22 10:51:49 -06:00
Thomas S Hatch
a178d444b8 Merge pull request #22946 from s0undt3ch/2014.7
Test with a more recent pip version to avoid a traceback
2015-04-22 10:25:17 -06:00
Mike Place
a2d2a5b3cb Merge pull request #22931 from jacksontj/2015.2
Cleanup jinja attribute access for loader
2015-04-22 09:35:29 -06:00
Pedro Algarvio
bc87749e2c Test with a more recent pip version to avoid a traceback
```
07:39:05,449 [salt.minion                                :1178][ERROR   ] A command in 'pip.list' had a problem: Traceback (most recent call last):
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/bin/pip", line 9, in <module>
    load_entry_point('pip==1.3.1', 'console_scripts', 'pip')()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 546, in load_entry_point
    return get_distribution(dist).load_entry_point(group, name)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2666, in load_entry_point
    return ep.load()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2339, in load
    return self.resolve()
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pkg_resources/__init__.py", line 2345, in resolve
    module = __import__(self.module_name, fromlist=['__name__'], level=0)
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/__init__.py", line 13, in <module>
    from pip.commands import commands, get_similar_commands, get_summaries
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/__init__.py", line 6, in <module>
    from pip.commands.bundle import BundleCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/bundle.py", line 5, in <module>
    from pip.commands.install import InstallCommand
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/commands/install.py", line 5, in <module>
    from pip.req import InstallRequirement, RequirementSet, parse_requirements
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/__init__.py", line 3, in <module>
    from .req_install import InstallRequirement
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/req/req_install.py", line 20, in <module>
    import pip.wheel
  File "/tmp/salt-tests-tmpdir/6833-pip-upgrade-pip/lib/python2.6/site-packages/pip/wheel.py", line 23, in <module>
    from pip.exceptions import InvalidWheelFilename, UnsupportedWheel
ImportError: cannot import name InvalidWheelFilename
```
2015-04-22 16:13:58 +01:00
Justin Findlay
2589e15e5c Merge pull request #22938 from jayeshka/powerpath-unit-test
adding powerpath unit test case
2015-04-22 08:51:39 -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
5a5c7ef415 adding powerpath unit test case 2015-04-22 17:38:44 +05:30
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
Viet Hung Nguyen
b13db32fde add test for #18843 2015-04-22 16:21:23 +07:00
Thomas Jackson
98af7c3f95 Cleanup jinja attribute access for loader
Refactor of #22723
2015-04-21 22:39:17 -07:00
Felix Dreissig
468d392074 Adjust tests to the new return value of modules.localemod.gen_locale() 2015-04-21 19:11:33 -06:00
Nicole Thomas
2793ad667b Merge pull request #22911 from rallytime/test_fixes
Fix some Python 2.6-related test failures on 2015.2
2015-04-21 18:44:37 -06:00
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
rallytime
1be53aaf7d Remove Python 2.6 incompatible section of test
A portion of this test seems to be only testing the differences
between the way Python is using the help string between 2.6 and
2.7. This section doesn't really seem to be testing any salt code.
2015-04-21 12:25:31 -06:00
rallytime
3ce1cef592 Fix Python 2.6 syntax error in unit.modules.state_test.py 2015-04-21 11:01:33 -06:00
Colton Myers
92c51affc5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-21 10:33:39 -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
8b2e60127d Merge pull request #22893 from s0undt3ch/hotfix/lint-2015.2
[2015.2] Lint Fixes
2015-04-21 09:24:49 -06:00
Justin Findlay
c2a5d59fb7 Merge pull request #22890 from jayeshka/postfix-unit-test
adding postfix unit test case
2015-04-21 09:01:18 -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
Pedro Algarvio
3ae68c4f7b Minor cosmetic changes in order not to disable the PEP8 PyLint code all together 2015-04-21 15:03:47 +01:00
Pedro Algarvio
ae2bca1f6f Fix W1504(unidiomatic-typecheck 2015-04-21 14:02:17 +01:00
Jayesh Kariya
2cfd1a4395 adding postfix unit test case 2015-04-21 17:36:07 +05:30
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
Justin Findlay
be16c24b0b Merge pull request #22845 from jayeshka/augeas-states-unit-test
adding states/augeas unit test case
2015-04-20 21:25:55 -06:00
Justin Findlay
03af523de9 Merge pull request #22853 from s0undt3ch/2014.7
Don't assume package installation order.
2015-04-20 20:42:41 -06:00
Thomas S Hatch
d5d1ddc8d6 Merge pull request #22705 from jayeshka/win_dns_client_unit_test
adding win_dns_client test case and used @patch for mocking.
2015-04-20 09:50:22 -06:00
Justin Findlay
3651d21ad4 Merge pull request #22743 from jayeshka/netscaler-unit-test
adding netscaler unit test case
2015-04-20 09:25:17 -06:00
Thomas S Hatch
a7ff60491b Merge pull request #22815 from plastikos/issue-22797
Fix failure with nested nodegroups:
2015-04-20 09:12:54 -06:00
Pedro Algarvio
b62df62151 Don't assume package installation order.
Additionally pep8 when installed using wheel, reports the version
together with the name.
2015-04-20 14:45:25 +01: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
Thayne Harbaugh
b37b6b2849 Add a test for incorrectly-nested nodegroups that cause a resolution loop. 2015-04-17 17:01:47 -06:00
Thayne Harbaugh
6c1d4d58e9 Fix failure with nested nodegroups:
If a nodegroup was re-used - even if it wasn't a circular reference - it
would fail the nodegroup expansion with the following message:

    Failed nodegroup expansion: illegal nested nodegroup "min"

This was simply because already-visited nodegroups are pushed into `skip`
but were never popped.

   * Add another test case for this situation.
   * Pop the current nodegroup from `skip` when leaving the expansion
     context

Fixes: #22797
2015-04-17 15:20:34 -06:00
Justin Findlay
1c288dc146 Merge pull request #22505 from jayeshka/sysmod-unit-test
adding sysmod unit test case.
2015-04-17 15:03:39 -06:00
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
Nicole Thomas
4d396e5e94 Merge pull request #22777 from jayeshka/apache_module-states-unit-test
adding states/apache_module unit test case
2015-04-17 12:08:01 -06:00
Rahul Handay
33da15b07b Adding pkg_resouce.py unit tests 2015-04-17 17:52:13 +05:30
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
Jayesh Kariya
5905b03ed8 resolved errors. 2015-04-17 12:34:26 +05:30
Justin Findlay
cf94017d88 fix saltmod.function unit test 2015-04-16 14:41:46 -06:00
Thomas S Hatch
94e4e6bc1e Merge pull request #22723 from thatch45/lazy_layers
Fix the lazy loader to keep a top level key ref
2015-04-16 10:36:26 -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
Thomas S Hatch
c003252a8e Fix test 2015-04-16 09:33:50 -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
0ef4df8e0f adding netscaler unit test case 2015-04-16 17:21:51 +05:30
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
Thomas S Hatch
f8cdc5060e fix sysdoc tests for new module level hooks 2015-04-15 19:42:23 -06:00
Thomas S Hatch
586b81b33e Add tests for the jinja demands 2015-04-15 16:39:08 -06:00
Justin Findlay
3d2221ded4 fix test_sls_id unit test 2015-04-15 12:53:50 -06:00
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
Justin Findlay
58735aaa62 Merge pull request #22701 from rahulhan/states_iptables_unit_tests
Adding states/iptables.py unit tests
2015-04-15 10:24:10 -06:00
Thomas S Hatch
3f800a7fd2 Merge pull request #22639 from jayeshka/win_network-new-unit-test
adding win_network unit test case
2015-04-15 09:55:54 -06:00
Rahul Handay
d3e25ff4ae Adding states/nftables.py unit test cases 2015-04-15 18:55:21 +05:30
Jayesh Kariya
f56c24f909 adding win_dns_client test case and used @patch for mocking. 2015-04-15 18:42:38 +05:30
Rahul Handay
e6b6c41785 Adding states/iptables.py unit tests 2015-04-15 17:15:23 +05:30
Jayesh Kariya
63a1a58e32 used @patch for mocking. 2015-04-15 13:16:03 +05:30
Rahul Handay
83aa84c2a7 Adding state.py unit test 2015-04-15 13:01:36 +05:30
Jayesh Kariya
4c2a3f01b5 used @patch for mocking. 2015-04-15 12:10:54 +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
Colton Myers
a02ced40f0 Lint 2015-04-14 12:57:25 -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
Nicole Thomas
6a1b02f58b Revert "adding win_dns_client unit test case" 2015-04-14 12:22:58 -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
0b65822264 Merge pull request #22647 from jayeshka/pecl-unit-test
adding pecl unit test case.
2015-04-14 09:09:11 -06:00
Justin Findlay
0795c64afa Merge pull request #22640 from jayeshka/win_dns_client-new-unit-test
adding win_dns_client unit test case
2015-04-14 08:46:14 -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
Jayesh Kariya
1d423feeba adding pecl unit test case. 2015-04-14 17:58:15 +05:30
Jayesh Kariya
aa3a793d8f removed Mocknetwork call 2015-04-14 17:42:15 +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
6abe3fa0f4 adding win_dns_client unit test case 2015-04-14 15:55:11 +05:30
Jayesh Kariya
1bb4251aa1 adding win_network unit test case 2015-04-14 15:49:20 +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
Nicole Thomas
0ab8af8802 Merge pull request #22593 from rallytime/fix_windows_unit_tests
Remove Mockwinapi mocking class from win_dns_client_test
2015-04-13 10:16:01 -06:00
Nicole Thomas
89d53bc063 Revert "adding win_network unit test case." 2015-04-13 09:56:05 -06:00
rallytime
b5d8c21c85 Remove Mockwinapi mocking class from win_dns_client_test
The tests run on the same process, the Mockwinapi class is squashing
salt.utils and causing problems in the test suite.

Refs #22582
2015-04-13 09:53:48 -06:00
Justin Findlay
bdfed667c9 Merge pull request #22579 from rahulhan/xapi_unit_tests
Adding xapi.py unit test cases
2015-04-13 09:13:07 -06:00
Justin Findlay
18d2db5770 Merge pull request #22585 from rahulhan/pagerduty_unit_test
Adding pagerduty.py unit tests
2015-04-13 08:21:20 -06:00
Justin Findlay
c6902f9aa4 Merge pull request #22583 from jayeshka/win_network-unit-test
adding win_network unit test case.
2015-04-13 08:18:44 -06:00
Rahul Handay
d244da2c02 Adding pagerduty.py unit tests 2015-04-13 18:21:17 +05:30
Jayesh Kariya
63bf71edec adding win_network unit test case. 2015-04-13 18:08:46 +05:30
Jayesh Kariya
5bd5d8810f adding win_dns_client unit test case. 2015-04-13 18:06:45 +05:30
Rahul Handay
3048513cb4 Adding xapi.py unit test cases 2015-04-13 17:38:19 +05:30
Justin Findlay
e132bcd5ca further saltnado lint 2015-04-12 16:39:57 -06:00
Thomas Jackson
5c0cca47d3 No reason to implement get_app in the mixin 2015-04-11 16:48:05 -07:00
Thomas Jackson
6f4a009343 Pylint fixup 2015-04-11 16:46:55 -07:00
Thomas S Hatch
f9df9fda79 Merge pull request #22529 from jayeshka/gpg-unit-test
adding gpg unit test case.
2015-04-10 09:54:04 -06:00
Thomas S Hatch
fbf35f94ab Merge pull request #22491 from plastikos/improvement-nested_nodegroups
improvement: Support nested nodegroups
2015-04-10 09:17:27 -06:00
Nicole Thomas
f8cae2ccd9 Merge pull request #22525 from rahulhan/oracle_unit_test
Adding oracle.py unit test cases
2015-04-10 09:12:34 -06:00
Thomas S Hatch
2481e6cc63 Merge pull request #22464 from jacksontj/2014.7
2014.7: Fix Batching
2015-04-10 09:11:25 -06:00
Jayesh Kariya
fd5ee79375 resolved error. 2015-04-10 18:50:15 +05:30
Jayesh Kariya
5a53ff1fcd adding win_disk unit test case. 2015-04-10 18:01:22 +05:30
Jayesh Kariya
92040b24bd adding gpg unit test case. 2015-04-10 18:00:08 +05:30
Rahul Handay
a157b5e32a Adding oracle.py unit test cases 2015-04-10 16:10:38 +05:30
Pedro Algarvio
1181a50d0d Don't assume we're running the tests as root 2015-04-10 00:52:32 +01:00
Pedro Algarvio
0940548d58 The decorator looks for 2 binaries. We always want the first. 2015-04-10 00:26:15 +01:00
Thomas Jackson
77395d76d8 Change to sets, we don't gaurantee minion ordering in returns 2015-04-09 09:06:59 -07:00
Justin Findlay
5c73b1ceb7 Merge pull request #22500 from rahulhan/states_hg_unit_test
Adding states/hg.py unit test cases
2015-04-09 09:07:11 -06:00
Justin Findlay
25903258b2 Merge pull request #22496 from rahulhan/states_host_unit_test
Adding states/host.py unit test cases
2015-04-09 09:06:49 -06:00
Justin Findlay
b232a73db7 Merge pull request #22504 from jayeshka/serverdensity_device-unit-test
adding serverdensity_device unit test case.
2015-04-09 09:06:25 -06:00
Thomas Jackson
7614f7ed10 Caste returns to sets, since we don't care about order. 2015-04-09 07:45:24 -07:00
Justin Findlay
ae55fb4824 Merge pull request #22499 from rahulhan/states_http_unit_test
Adding states/http.py unit test cases
2015-04-09 07:17:29 -06:00
Jayesh Kariya
e86334f90e adding sysmod unit test case. 2015-04-09 17:32:17 +05:30
Jayesh Kariya
8afff0f337 adding serverdensity_device unit test case. 2015-04-09 17:29:48 +05:30
Rahul Handay
2a6073dde5 Adding states/hg.py unit test cases 2015-04-09 15:44:22 +05:30
Rahul Handay
80bf9e8734 Adding states/http.py unit test cases 2015-04-09 15:42:01 +05:30
Rahul Handay
65adbce5e7 Adding states/host.py unit test cases 2015-04-09 13:02:15 +05:30
Rahul Handay
0b28284b7d Adding win_service.py unit test cases 2015-04-09 12:31:51 +05:30
Thayne Harbaugh
1c3536fb8e Support nested nodegroups
Nodegroups can be recursively expanded without worrying about other
compound matcher expansions.  Once the nodegroups are expanded on the
master the remaining flattened compound match can be expanded without the
nodegroup information.
2015-04-08 23:16:39 -06:00
Justin Findlay
ad7b066dce Merge pull request #22455 from jayeshka/grains-unit-test
adding states/grains unit test case.
2015-04-08 09:05:30 -06:00
Thomas Jackson
30db262481 Add timeout to batch tests 2015-04-08 07:53:54 -07:00
Nicole Thomas
f8d81dde1e Merge pull request #22459 from jayeshka/smtp_states-unit-test
adding states/smtp unit test case.
2015-04-08 08:45:27 -06:00
Nicole Thomas
2fd7b8c3b2 Merge pull request #22457 from jayeshka/sysctl-unit-test
adding states/sysctl unit test case.
2015-04-08 08:43:06 -06:00
Nicole Thomas
fa14bd128e Merge pull request #22456 from rahulhan/states_svn_unit_test
Adding states svn.py unit test cases
2015-04-08 08:42:19 -06:00
Jayesh Kariya
481e2e4ad0 adding states/smtp unit test case. 2015-04-08 17:54:52 +05:30
Jayesh Kariya
5a016c5eda cosmetic change 2015-04-08 17:49:38 +05:30
Jayesh Kariya
705c387368 doc string change. 2015-04-08 17:18:04 +05:30
Jayesh Kariya
a9ba68699a adding states/sysctl unit test case. 2015-04-08 16:25:57 +05:30
Rahul Handay
0fdda87e23 Adding states svn.py unit test cases 2015-04-08 16:20:51 +05:30
Jayesh Kariya
3002729f72 adding states/grains unit test case. 2015-04-08 14:13:20 +05:30
Rahul Handay
ea5a039858 Adding win_repo.py unit test cases 2015-04-08 14:07:03 +05:30
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
Thomas S Hatch
80a194bc20 Merge pull request #22401 from jfindlay/api_tests
sort integration test minion return lists
2015-04-07 09:15:44 -06:00
Thomas S Hatch
ebdf143c7e Merge pull request #22350 from jacksontj/2015.2
2015.2: Fix batching
2015-04-07 09:13:46 -06:00
Thomas S Hatch
234cb65a23 Merge pull request #22319 from plastikos/improvement-pillar_pcre
Improvement: add pillar PCRE matching
2015-04-07 09:09:49 -06:00
Justin Findlay
d640823767 Merge pull request #22407 from jayeshka/win_servermanager-unit-test
adding win_servermanager unit test case.
2015-04-07 08:40:33 -06:00
Mike Place
ea97a9e600 Merge pull request #22410 from jayeshka/smtp-unit-test
adding smtp unit test case.
2015-04-07 08:25:25 -06:00
Nicole Thomas
d06df7f1e9 Merge pull request #22405 from rahulhan/states_git_unit_test
Adding git.py (states) unit tests
2015-04-07 07:47:50 -06:00
Jayesh Kariya
605d4f3ea9 adding smtp unit test case. 2015-04-07 17:39:32 +05:30
Jayesh Kariya
a0cd8189de adding win_servermanager unit test case. 2015-04-07 15:44:24 +05:30
Rahul Handay
a807d2c55b Adding git.py (states) unit tests 2015-04-07 15:05:25 +05:30
Rahul Handay
7462556283 Adding win_path.py unit test cases 2015-04-07 14:16:45 +05:30
Justin Findlay
fceb83bf16 sort integration test minion return lists 2015-04-06 22:07:56 -06:00
Justin Findlay
56364ff571 adding cmd.run state integration tests 2015-04-06 20:32:22 -06:00
Thomas Jackson
5d8a4d7ab7 Add timeout to batch tests 2015-04-06 16:46:44 -07:00
Mike Place
ce0fb585de Merge pull request #22344 from jfindlay/bp-21652
Backport #21652 from develop to 2015.2
2015-04-06 11:25:26 -06:00
Mike Place
d8815c7dbc Merge pull request #22343 from jfindlay/shell_enabled_tests
add shell {en|dis}abled tests for cmdline, templates
2015-04-06 11:24:14 -06:00
Justin Findlay
54c83e3fe7 Merge pull request #22380 from jayeshka/win_ip-unit-test
adding win_ip unit test case.
2015-04-06 07:39:32 -06:00
Jayesh Kariya
6c7ed37c87 adding win_ip unit test case. 2015-04-06 15:35:01 +05:30
Rahul Handay
37731bbfdf Adding win_system unit test cases 2015-04-06 14:16:38 +05:30
Pedro Algarvio
ff4aa5b989 Include unless in the state internal keywords.
Fixes #22359
2015-04-05 01:00:08 +01:00
Thayne Harbaugh
a7a33b381c Various fixes:
* Add missing spaces in help
   * Correct order of arguments to _check_cache_minions() (not part of pillar_pcre)
   * Add platening of pillar_pcre to pillar_exact_minions
   * Add missing match to pillar_pcre
   * Correct unit test
2015-04-03 18:32:52 -06:00
Justin Findlay
fb8b1858a7 shell {en|dis}abled tests for cmdline, templates 2015-04-03 18:08:13 -06:00
Mike Place
f3df92834d More helper text, refactor filehandles, clean up 2015-04-03 15:34:47 -06:00
Mike Place
018400d94c Remove loop interval setting, was causing cpus to spin 2015-04-03 15:34:47 -06:00
Mike Place
275993ee18 Include parser option for --no-tests 2015-04-03 15:34:46 -06:00
Nicole Thomas
b23dd2234d Merge pull request #22315 from rahulhan/event_unit_test
Adding states event.py unit tests
2015-04-03 06:30:58 -06:00
Nicole Thomas
cd69833731 Merge pull request #22318 from jayeshka/twilio_notify-unit-test
adding twilio_notify unit test case.
2015-04-03 06:30:13 -06:00
Rahul Handay
a572f3cadc Adding nova.py unit tests 2015-04-03 14:40:46 +05:30
Jayesh Kariya
57925820ed adding twilio_notify unit test case. 2015-04-03 14:29:49 +05:30
Thayne Harbaugh
c91392bc91 Add option -J/--pillar-pcre to match on pillar PCREs 2015-04-03 02:47:19 -06:00
Rahul Handay
034386e855 Adding states event.py unit tests 2015-04-03 11:24:47 +05:30
Mike Place
5b6075c74c Merge pull request #22287 from jfindlay/debug_rest_tornado_test
debug rest_tornado test error
2015-04-02 09:22:14 -06:00
Justin Findlay
a927087f64 debug rest_tornado test error 2015-04-02 09:05:48 -06:00
Justin Findlay
e48df011fa adding alias state unit tests 2015-04-01 22:12:33 -06:00
Thomas S Hatch
8ec0c820a6 Merge pull request #22253 from rallytime/merge-22246
Merge #22246 with pylint fix and test cleanup
2015-04-01 13:03:27 -06:00
rallytime
7b859df4d1 Merge #22246 with pylint fix and test cleanup
Refs #22246
2015-04-01 10:29:23 -06:00
Thomas Jackson
d70e094183 Add initial tests for loader's public interfaces
Tests for #22117
2015-04-01 07:55:02 -07:00
Colton Myers
ed51f2bb7c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-31 11:25:27 -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
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
Colton Myers
0269f3d544 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-30 09:30:58 -06:00
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
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
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
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
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
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
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
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
cc9d294fcd Merge pull request #21569 from basepi/merge-forward-2015.2
Merge forward from 2014.7 to 2015.2
2015-03-12 13:36:39 -06:00
Colton Myers
bdfdd3f232 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/modules/virt.py
2015-03-11 16:09:57 -06:00
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
2015-03-11 15:14:56 -06:00
Thomas S Hatch
4873382184 Merge pull request #21487 from rallytime/bp-21469
Backport #21469 to 2014.7
2015-03-11 15:05:08 -06:00