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
61,627 Commits 24 Branches 182 Tags 341 MiB
3d245bbe84
Commit Graph

1658 Commits

Author SHA1 Message Date
Michael Steed
f725b8e4fe lint 2015-06-09 13:14:54 -06:00
Michael Steed
de7fe49830 py3: fix tests/unit/modules/virt_test.py 
In libvirt_domain.jinja, use disk.items() instead of the py2-only
iteritems(). The number of disks should be small enough for this not to
matter.

in virt_test.py, don't rely on the py2 behavior of str/int comparison,
and don't rely on dict.keys() being indexable.
 2015-06-09 13:06:44 -06:00
Michael Steed
0543f9aa0d fix tests/unit/modules/network_test.py 
Explicitly test salt.ext.ipaddress in test_is_private() and
test_is_loopback() as originally intended.
 2015-06-09 12:13:04 -06:00
Michael Steed
ce5f14bb0e set encoding in test__unicode_match() 2015-06-09 11:19:51 -06:00
Thomas S Hatch
06279dd9b0 Merge pull request #24514 from msteed/py3-unittests-3 
More py3 unittest fixes
 2015-06-09 09:10:35 -06:00
Nicole Thomas
87e1c6008c Merge pull request #24459 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-08 22:27:08 -06:00
Joe Julian
4a840f39d5 Fix tls test to work against develop branch 2015-06-08 17:36:29 -07:00
Joe Julian
048713747c Revert "Disable tls tests (for now)" 
This reverts commit 5833a0e535.
 2015-06-08 16:29:23 -07:00
Michael Steed
cb83dbf87e py3: fix tests/unit/modules/pkg_resource_test.py 
Mock the correct next()
 2015-06-08 16:18:00 -06:00
Michael Steed
03ba3c4b1d py3: fix tests/unit/modules/network_test.py 
Mock whichever ipaddress modules was imported by the network module
 2015-06-08 16:16:52 -06:00
Michael Steed
cded6bfc70 py3: fix salt/modules/rh_ip.py and tests 
- use six-wrapped StringIO
- fix int/str comparison
 2015-06-08 16:14:35 -06:00
Michael Steed
980e799122 py3: fix salt/modules/postgres.py and tests 
- In db_create(), use an OrderedDict for options. This probably doesn't
  matter in production, but a deterministic order makes the unit test
  work across python 2 and 3.
- Use six-abstracted StringIO
- Use 0 instead of None as the expected successful return code
- Pass bytes instead of str to hashlib.md5()
 2015-06-08 16:08:10 -06:00
Colton Myers
5833a0e535 Disable tls tests (for now) 2015-06-08 15:27:47 -06:00
Michael Steed
97be5d7551 py3: fix tests/unit/modules/ini_manage_test.py 2015-06-08 08:49:14 -06:00
Michael Steed
bd8538db97 py3: fix salt/modules/file.py and unit tests 
Most of the routines in the file execution module that operate on file
contents assume that they are dealing with text files (line-oriented
operations, regular expressions, etc). The exceptions are get_sum(),
get_hash(), and check_hash(). Outside of these three routines, files are
now opened in text mode.
 2015-06-08 08:49:09 -06:00
Michael Steed
3c5e82e878 py3: fix tests/unit/modules/deb_apache_test.py 2015-06-08 08:48:55 -06:00
Michael Steed
a1b693a9d1 fix failure in btrfs_test.py 
test was failing on machines where /dev/sda3 was mounted
 2015-06-08 08:48:33 -06:00
Michael Steed
83a96367a4 Manual merge of #24414 per thatch45 2015-06-06 07:47:52 -06:00
Colton Myers
9cf402e0a7 Python3 compat 2015-06-05 13:52:35 -06:00
Colton Myers
6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/modules/all/salt.modules.system_profiler.rst
    salt/fileclient.py
    salt/loader.py
    salt/modules/tls.py
    salt/modules/win_path.py
    salt/states/pkg.py
    salt/utils/event.py
    salt/utils/pagerduty.py
    tests/unit/modules/seed_test.py
 2015-06-05 13:03:48 -06:00
Gareth J. Greenaway
c95f8be0ae Updating unit tests based on changes to module. 2015-06-04 20:33:52 -07:00
Justin
1df4020ec2 Changed mock path to be absolute in test_parse_targets 2015-06-04 11:11:33 -06:00
Justin Findlay
deaee68b89 Merge pull request #24371 from joejulian/2015.5_tls_module_tests 
2015.5 tls module tests
 2015-06-04 09:20:16 -06:00
Christophe Drevet-Droguet
7b9451451f module grains tests: test list order preservation 2015-06-04 09:52:09 +02:00
Justin
7570ae9132 Disabled flaky test to review later 2015-06-03 16:27:33 -06:00
Joe Julian
4c5dee1e25 Add @destructiveTest decorator to destructive tests 2015-06-03 15:27:05 -07:00
Joe Julian
274bbd4d43 Accept results from older pyOpenSSL 2015-06-02 18:17:05 -07:00
Joe Julian
161f913522 All cert info should be in UTC always 2015-06-02 18:17:05 -07:00
Joe Julian
9affcca766 See the whole diff if dict compare fails 2015-06-02 18:17:05 -07:00
Joe Julian
94f620857c Ignore extensions for now. Resolve this as part of fixing issue 24338. 2015-06-02 18:17:04 -07:00
Joe Julian
84904d31f1 Mask lint warning for unused imported module 2015-06-02 18:17:04 -07:00
Joe Julian
5675b78459 Do not test if PyOpenSSL is not installed 2015-06-02 18:17:04 -07:00
Joe Julian
563cc66311 Add tls tests 2015-06-02 18:17:04 -07:00
Christophe Drevet-Droguet
756f5d8716 new set function for module grains, and unit tests 2015-06-02 15:41:26 +02:00
Nicole Thomas
e7542e7a38 Merge pull request #24236 from jdsieci/develop 
RedHat IPv6 static routes
 2015-05-30 21:34:24 -06:00
Jerzy Drozdz
2f3d0298af pylint volation fixes 2015-05-30 02:04:49 +02:00
Colton Myers
5fcbcfe6d5 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/cloud/digitalocean.rst
    doc/topics/tutorials/index.rst
    salt/cloud/clouds/digital_ocean.py
    salt/modules/lxc.py
    salt/returners/__init__.py
 2015-05-29 17:33:28 -06:00
Jerzy Drozdz
9eb9892516 Changed return values and assertions to lists 2015-05-30 01:03:43 +02:00
Thomas S Hatch
a28515aa2c Merge pull request #23060 from makinacorpus/service 
ubuntu systemd/legacy init support
 2015-05-29 17:02:08 -06:00
Colton Myers
75590cf490 Merge pull request #24080 from makinacorpus/lxc_consistency2 
Lxc consistency2
 2015-05-29 16:51:54 -06:00
Jerzy Drozdz
e564a0b473 Added setting of __grains__['osrelease'] in test 2015-05-30 00:16:25 +02:00
Colton Myers
90cb448910 Fix rest of rabbitmq tests 2015-05-29 15:11:25 -06:00
Colton Myers
7736509c6b Fix rabbitmq test 2015-05-29 15:11:19 -06:00
Jayesh Kariya
9b9aeb8628 resolved all erors. 2015-05-29 12:49:23 +05:30
Jayesh Kariya
aaf89354c0 adding win_groupadd unit test case. 2015-05-28 17:12:58 +05:30
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
 2015-05-26 16:38:42 -06:00
rallytime
ac0f97de51 Fixes the boto_vpc_test failure on CentOS 5 tests 
pkg_resources.get_distribution doesn't work on CentOS 5 since it looks
for moto in site-packages and not pip (which is how we're installing it
in the salt-jenkins states).

This catches the exception through by get_distribution so we can run the
rest of the tests in this file.
 2015-05-26 12:25:51 -06:00
Thomas S Hatch
dd90ef09b9 Merge pull request #24078 from jfindlay/locale_charmap 
if a charmap is not supplied, set it to the codeset
 2015-05-25 13:39:19 -06:00
Jayesh Kariya
e11988969f adding varnish unit test case 2015-05-25 16:01:02 +05:30
Mathieu Le Marec - Pasquet
458f50617b seed: lint 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-24 14:50:24 +02:00
Mathieu Le Marec - Pasquet
96b8d55f14 Fix seed.mkconfig yamldump 
This fixes #24071

Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
 2015-05-24 14:07:07 +02:00
Justin Findlay
5eb97f0973 if a charmap is not supplied, set it to the codeset 
Fixes #23221.
 2015-05-22 14:48:39 -06:00
Gareth J. Greenaway
a09f0b23bd Updating schedule unit tests to align with refactoring changes. 2015-05-22 09:17:53 -07:00
Colton Myers
58aed60838 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    salt/runners/lxc.py
 2015-05-21 11:27:52 -06:00
Jayesh Kariya
1ec33e22a7 removed assertion error 2015-05-21 18:57:58 +05:30
Jayesh Kariya
16ecb28950 adding timezone unit test case 2015-05-21 17:05:56 +05:30
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
Jayesh Kariya
89eb00815e adding system unit test case 2015-05-20 16:06:10 +05:30
Colton Myers
ed3a71dc72 Fix scheduleadd test 2015-05-19 09:53:01 -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
Jayesh Kariya
280abdec7c adding sysbench unit test case 2015-05-18 17:43:37 +05:30
Weilu Jia
64634b6349 Update psutil.pid_list to use psutil.pids 2015-05-15 14:25:03 -07:00
Weilu Jia
8a1da33ada Fix test cases by mocking psutil_compat 2015-05-15 14:11:12 -07:00
Weilu Jia
7d02ad4f06 Fix some of the mock names for the new API 2015-05-15 13:03:26 -07:00
Weilu Jia
93ee411fd5 Create compatability psutil. 
psutil 3.0 drops 1.0 API, but we still support old psutil versions.
 2015-05-15 13:03:25 -07: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
Justin Anderson
982f87316d Merge pull request #23781 from jfindlay/fix_locale_tests 
fix unit test mock errors on arch
 2015-05-15 13:40:07 -06:00
Justin Findlay
14c711eeb3 fix unit test mock errors on arch 2015-05-15 12:50:55 -06:00
Justin Findlay
aab9c431d0 Merge pull request #23777 from jfindlay/merge_23665 
Merge #23665
 2015-05-15 12:16:21 -06:00
Thomas S Hatch
348645ecd5 Merge pull request #23736 from jfindlay/fix_pip 
always load pip execution module
 2015-05-15 12:10:16 -06:00
Justin Findlay
87e000d053 fix ssh module unit tests 2015-05-15 11:11:29 -06:00
Jayesh Kariya
19939cfa98 adding svn unit test case 2015-05-15 17:39:21 +05:30
Javier Domingo
63620725c3 Remove trailing whitespace 2015-05-15 13:00:11 +02:00
Justin Findlay
b8867a8c23 update pip tests 2015-05-15 00:15:26 -06:00
Javier Domingo Cansino
5cab0ecc95 ssh: AuthorizedKeysFile expands defined tokens 2015-05-15 00:45:24 +02:00
Justin Findlay
e90bb252d3 update debian_ip unit tests 
Related to 5ff749e4 (#23554).
 2015-05-14 13:45:06 -06:00
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
Justin Findlay
e480f13688 Merge pull request #23675 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-05-13 12:35:54 -06:00
Colton Myers
5ee7f25ee4 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-13 11:50:33 -06:00
Colton Myers
acdd3fc6bd Fix lint 2015-05-13 11:47:43 -06:00
Jayesh Kariya
17987d97f0 made changes to test_interfaces function. 2015-05-13 10:35:05 -06:00
Jayesh Kariya
6e05148962 adding solr unit test case 2015-05-13 17:14:53 +05:30
Jayesh Kariya
0936e1d386 made changes to test_interfaces function. 2015-05-13 11:09:40 +05:30
Colton Myers
eca368a0ee Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-05-12 16:09:12 -06:00
Colton Myers
680e88f058 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    salt/modules/ebuild.py
    tests/unit/modules/grains_test.py
 2015-05-12 16:06:36 -06:00
Nicole Thomas
cbe32828ef Merge pull request #23580 from jayeshka/smf-unit-test 
adding smf unit test case
 2015-05-12 10:29:58 -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
4f9719157b adding smf unit test case 2015-05-12 18:06:49 +05:30
Colton Myers
9b2f27b87f Remove unused mock_open 2015-05-11 15:52:24 -06:00
Colton Myers
3c51d36599 Remove tests.unit.modules.seed_test.test_mkconfig 
Was creating False.pem and False.pub files, and wasn't compatible with
new crypt.py changes. Should be rewritten as a proper, destructive,
integration test.
 2015-05-11 15:11:58 -06:00
Christophe Drevet-Droguet
ebff9df5b2 fix pylint errors 2015-05-11 21:21:10 +02:00
Justin Findlay
e9b94d36d3 additional mock for rh_ip_test test_build_bond 
Fixes #23473.
 2015-05-11 12:31:24 -06:00
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
salt_build
b3f284c517 Fixed tests 2015-05-11 15:49:19 +00:00
Jayesh Kariya
3ad5314ee0 adding service unit test case 2015-05-11 18:01:10 +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
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
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
Colton Myers
e6905b4073 Delete the win_useradd tests 2015-05-07 23:46:51 -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
Colton Myers
ce9064dc74 No arguments to list_users 2015-05-07 09:54:57 -06:00
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
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
Jayesh Kariya
a4dd836125 adding rsync unit test case 2015-05-06 17:31:04 +05:30
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Jayesh Kariya
f9da6db459 adding riak unit test case 2015-05-05 15:39:52 +05:30
Justin Findlay
11d893db19 explicitly quote requirements filename 2015-05-04 23:24:46 -06:00
Thomas S Hatch
e23e4f6ef8 Merge pull request #23309 from rmcleay/secgroup_egress 
Egress rule support for boto_secgroup
 2015-05-04 14:57:02 -06:00
Tarjei Husøy
64f661d2cc Add missing jump arguments to iptables module 
I think this is all the arguments supported.

Also adds test for no-arg options and adds some docs on no-arg.

Point to discuss:
 - The --save option crashes with our defined --save option. Probably
   no rush since no one's complained so far, but this should be fixed.
   Maybe we can rename this one to connsecmark-save, since it only appears
   as an option to the CONNSECMARK jump target? Maybe also rename restore
   to connsecmark-restore too, for consistency, even though restore
   doesn't collide with anything?
 2015-05-04 13:19:23 +02:00
Robert McLeay
57067a3c0f Fixing linting in boto_secgroup module and unit test. 2015-05-04 15:45:26 +10:00
Robert McLeay
c2695986fe Added rules_egress to boto_secgroup unit test. 2015-05-04 15:45:25 +10:00
Ronald van Zantvoort
d814b7f9a3 Better unit test fix, add 2 unit tests for IPv6 2015-05-01 20:29:25 +02:00
Ronald van Zantvoort
d81fbc4bc3 Unit test fix 2015-05-01 19:34:08 +02:00
Thomas S Hatch
4fabf465ff Merge pull request #23174 from jfindlay/locale_utils 
move locale utils to separate module
 2015-04-30 08:22:00 -07:00
Justin Findlay
f46db2c8cb move locale specifier utilities to utils/locales 2015-04-29 16:00:45 -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
Yoshito Komatsu
42ef698790 Fix typos 2015-04-29 21:40:31 +09:00
Yoshito Komatsu
1bda5365dd Fix tests 2015-04-29 21:37:59 +09:00
Jayesh Kariya
636c654205 adding rh_ip unit test case 2015-04-29 17:29:37 +05:30
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
Kevin Boulain
a9777c6167 fix tests for the parted module 2015-04-28 13:22:54 -06:00
Justin Findlay
baca0bd5cf Merge pull request #23136 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-28 12:00:23 -06:00
Colton Myers
d9cede5e27 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/win_file.py
 2015-04-28 09:52:30 -06:00
Kevin Boulain
e6c9cc9a83 fix tests for the parted module 2015-04-28 16:50:33 +02: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
Matthew Williams
68c7ba77a0 fix lint in boto_vpc execution module tests 2015-04-27 16:55:19 +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
Jayesh Kariya
a96e914a08 adding rbenv unit test case 2015-04-27 17:26:24 +05:30
Matthew Williams
91e155a960 add TODO to boto_vpc execution module tests 2015-04-27 06:17:34 +00:00
Matthew Williams
bd40be4b02 Merge branch 'develop' into boto_dicts 2015-04-25 18:29:13 +00:00
Mathieu Le Marec - Pasquet
46f703348a fix centos tests 2015-04-25 18:47:20 +02:00
Mathieu Le Marec - Pasquet
3df3d67fd1 consistent mock usage 2015-04-25 13:04:49 +02:00
Mathieu Le Marec - Pasquet
8f9ddbbb68 add some tests for ubuntu/systemd 2015-04-25 12:59:56 +02:00
Matthew Williams
f3d994a1c5 modules.boto_vpc: return dicts from all functions 2015-04-25 04:22:42 +00: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
49894795ad adding raet_publish unit test case 2015-04-24 17:30:24 +05:30
Thomas S Hatch
9a1a55850a Merge pull request #22963 from garethgreenaway/verify_schedule_functions_with_events 
Additions to schedule module
 2015-04-23 21:45:25 -06:00
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
Jayesh Kariya
b9188aea6a adding qemu_img unit test case 2015-04-23 18:13:27 +05:30
Gareth J. Greenaway
503bd89b59 lint 2015-04-22 22:02:49 -07:00
Gareth J. Greenaway
58bce28f14 fixing various things that caused unit tests to fail. updating unit tests based on code changes 2015-04-22 21:30:58 -07: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
Jayesh Kariya
5a5c7ef415 adding powerpath unit test case 2015-04-22 17:38:44 +05:30
Pedro Algarvio
b831d14bfc Properly indent comments 2015-04-21 20:35:14 -06:00
Felix Dreissig
468d392074 Adjust tests to the new return value of modules.localemod.gen_locale() 2015-04-21 19:11:33 -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
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
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
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
Jayesh Kariya
2cfd1a4395 adding postfix unit test case 2015-04-21 17:36:07 +05:30
Justin Findlay
bf52ba77fd Merge pull request #22829 from F30/gen_locale-return-value 
Always return a boolean in gen_locale()
 2015-04-20 21:58:43 -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
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
Matthew Williams
97bd79dd0e Merge remote-tracking branch 'origin/develop' into boto_dicts 2015-04-20 15:10:51 +00:00
Matthew Williams
afd182479c modules.boto_vpc: fix a couple bugs 2015-04-20 15:09:01 +00:00
Felix Dreissig
9e47d8ceba Adjust tests to the new return value of modules.localemod.gen_locale() 2015-04-18 20:41:14 +02: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
rallytime
9e83d85fd8 Another pylint fix for develop 2015-04-17 13:48:55 -06:00
Justin Findlay
1097d2587a Merge pull request #22798 from rallytime/pylint-develop 
Python 3 compat fixes for develop
 2015-04-17 13:14:45 -06:00
rallytime
1e4b93dec9 Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
Colton Myers
279e98aa6f Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/loader.py
 2015-04-17 11:37:58 -06:00
Rahul Handay
33da15b07b Adding pkg_resouce.py unit tests 2015-04-17 17:52:13 +05:30
Jayesh Kariya
5905b03ed8 resolved errors. 2015-04-17 12:34:26 +05:30
Matthew Williams
9ddfc6c82b boto_vpc: [WIP] always return dicts 2015-04-17 05:18:17 +00:00
rallytime
872974aefd Fully mock GPG mock class to allow gpg_tests to pass 2015-04-16 22:14:47 -06:00
rallytime
ad99c8014c Mock __salt__ and call to salt.loader.render to fix win_repo test 2015-04-16 21:22:03 -06:00
Colton Myers
e3be4bf704 Mock pillar_pcre for the mine tests 2015-04-16 17:18:50 -06:00
Colton Myers
40a6ed45eb Fix puppet test to mock cmd.run_all with return value including retcode 2015-04-16 17:18:50 -06:00
Colton Myers
e235c9759b Mock config.option for pagerduty tests 2015-04-16 12:36:40 -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
Jayesh Kariya
0ef4df8e0f adding netscaler unit test case 2015-04-16 17:21:51 +05:30
Justin Findlay
3d2221ded4 fix test_sls_id unit test 2015-04-15 12:53:50 -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
Jayesh Kariya
f56c24f909 adding win_dns_client test case and used @patch for mocking. 2015-04-15 18:42:38 +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
Matthew Williams
3501a28d03 boto_vpc_test: fix indentation 2015-04-15 02:58:06 +00:00
Matthew Williams
db8a9afc16 boto_vpc: remove duplicate func decl; fix string format 2015-04-15 02:00:34 +00:00
Matthew Williams
8fa76d7e40 lint on boto_vpc_test 2015-04-14 20:16:30 +00:00
Nicole Thomas
6a1b02f58b Revert "adding win_dns_client unit test case" 2015-04-14 12:22:58 -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
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
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
Matthew Williams
393f42c7b3 boto_vpc: test fixes 2015-04-14 01:23:50 +00:00
Matthew Williams
7b879f57de Merge branch 'boto_utils' into mergetest 
Conflicts:
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2015-04-14 01:21:49 +00:00
Matthew Williams
66f3c413e3 fix boto_ tests for use with utils.boto 2015-04-13 22:04:00 +00:00
Matthew Williams
4959bf4e1a modules.boto_vpc use utils get_conn and cache_id 2015-04-13 18:07:15 +00:00
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
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
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
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
0940548d58 The decorator looks for 2 binaries. We always want the first. 2015-04-10 00:26:15 +01: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
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
0b28284b7d Adding win_service.py unit test cases 2015-04-09 12:31:51 +05:30
Rahul Handay
ea5a039858 Adding win_repo.py unit test cases 2015-04-08 14:07:03 +05:30
Matthew Williams
6f9434cb10 [WIP] refactor boto_vpc execution module 2015-04-08 02:19:06 +00:00
Justin Findlay
2ef39ed380 add wake-on-lan unit tests 2015-04-07 14:41:28 -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
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
7462556283 Adding win_path.py unit test cases 2015-04-07 14:16:45 +05:30
Mike Place
4a57d46004 Merge pull request #22354 from dmyerscough/firewalld-unittest 
Unit test for firewalld features #22292
 2015-04-06 08:09:52 -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
Luca Corti
b9b307f5f2 Fix postgres.db_alter test, add test for owner_recurse=True 
The old db_alter test was probably failing anyway. The new test tests
owner_to is called when owner_recurse is set to true.
 2015-04-06 00:19:19 +02:00
Damian Myerscough
a42055dabe Remove duplicate test 2015-04-04 22:31:15 -07:00
Damian Myerscough
38ce75300c New features and updated unittests for new features 2015-04-04 16:01:03 -07:00
Damian Myerscough
aefa84ae8e Unittest for firewalld features 22292 2015-04-03 18:49:40 -07:00
Justin Findlay
257a1abc5e decrease specificity in schedule.modify unit test 
python-2.6 difflib's diff formatting is slightly different from the
formatting generated by the version of difflib python-2.7, so that
detail of the test has been removed.
 2015-04-03 12:14:33 -06:00
Thomas S Hatch
74bc55a5f8 Merge pull request #22326 from rallytime/fix_network_unittest 
Patch decorators.which for network_test.test_arp
 2015-04-03 09:44:37 -06:00
rallytime
39f3ff526a Patch decorators.which for network_test.test_arp 
If salt.utils.which('arp') is None, we shouldn't fail this test.

This fixes the Arch and Fedora test failures on develop
 2015-04-03 08:28:10 -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
rallytime
9c2ebd193c Python 3 compatibility changes for develop 2015-04-02 14:04:28 -06:00
jfindlay
d9369b1be7 Merge pull request #22262 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-02 08:36:06 -06:00
jfindlay
4ee34f0f62 Merge pull request #22282 from rahulhan/puppet_unit_test 
Adding puppet.py unit test cases
 2015-04-02 07:55:38 -06:00
Rahul Handay
78667caa68 Adding puppet.py unit test cases 2015-04-02 16:40:39 +05:30
Jayesh Kariya
1a9e6aab75 adding network unit test case. 2015-04-02 12:25:48 +05:30
jfindlay
b34d177a08 Merge pull request #22231 from jayeshka/rh_service_unit_test 
adding rh_service unit test
 2015-04-02 00:12:52 -06:00
Rahul Handay
f1f2a1ecf7 Adding nfs3.py unit test 2015-04-02 11:02:42 +05:30
Jayesh Kariya
79dafe79a1 changed FLAG to HAS_UPSTART 2015-04-02 10:50:58 +05:30
Colton Myers
5c9697f193 Fix data.cas test (mock dump) 2015-04-01 15:26:05 -06:00
Matthew Williams
6349352743 boto_vpc_test: fix name->subnet_name 2015-04-01 17:50:51 +00:00
Matthew Williams
89870b9146 fix typo in boto_vpc tests 2015-04-01 16:57:54 +00:00
Mike Place
8c4d064d9f Merge pull request #22243 from jayeshka/schedule-unit-test 
adding schedule unit test
 2015-04-01 09:34:13 -06:00
jfindlay
bdd543ab15 Merge pull request #22237 from rahulhan/systemd_unit_test 
Adding systemd.py unit tests
 2015-04-01 09:17:44 -06:00
Jayesh Kariya
07ee9602f4 resolved error. 2015-04-01 18:58:43 +05:30
Jayesh Kariya
2b6eccb75e adding schedule unit test 2015-04-01 18:11:48 +05:30
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
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
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
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
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
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
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
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