valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,598 Commits 24 Branches 182 Tags 341 MiB
3014afd517
Commit Graph

4789 Commits

Author SHA1 Message Date
rallytime
2e34277b65 Add '--no-psqlrc' option to new-to-carbon postgres unit test 2016-10-07 16:10:57 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
C. R. Oldham
b7f9eb7864 Fix test. 2016-10-06 14:20:29 -06:00
Mike Place
1284de27fc Merge pull request #36789 from maximeguillet/fix-psqlrc-pg9.6 
Fix behavior of psql -c option with postgresql 9.6
 2016-10-06 20:24:51 +09:00
Maxime Guillet
b59c23bef1 Fix one remaining postgresql tests linked to #36787. 2016-10-05 17:05:10 +02:00
Maxime Guillet
8b92ae2061 Fix postgresql tests using position in the argument list of psql. 
Some tests use position number in the argument list of psql command
to check their results. As #36787 add one element, next position
in the list must be used.
 2016-10-05 16:08:42 +02:00
Maxime Guillet
21f2a17a07 Fix postgresql tests by adding --no-psqlrc option introduced by #36787. 2016-10-05 14:43:02 +02:00
Erik Johnson
d916c2b49c Handle cases where retcode/output feature is backported 
This will handle the case of RHEL 7.3, which maintains an older version
of systemd with the retcode/output changes from "systemctl status" in
systemd 231 backported.
 2016-10-04 09:55:56 -05:00
Erik Johnson
b3364646ad Update systemd module unit tests 
The _systemctl_status() function has changed its return data, this
commit updates the affected tests to reflect this.
 2016-10-03 22:51:43 -05:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-30 16:13:08 -06:00
rallytime
7a03c4df8c Fix merge conflict resolution error 
The original conflict resolution adjusted the wrong line. This puts
the test changes on the correct line and restores the original line.
 2016-09-29 11:26:50 -06:00
rallytime
6bc3221f7b Update test to not use the nested context (for Py3 compat) 2016-09-29 11:25:46 -06:00
rallytime
112903ad7e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/modules/archive.py
  - salt/modules/cmdmod.py
  - tests/unit/states/service_test.py
 2016-09-29 09:56:43 -06:00
Denys Havrysh
bba9d0d105 alternatives.install state: detect alternatives command failed 2016-09-29 18:09:16 +03:00
Mike Place
ccd92d22d2 Merge pull request #36621 from terminalmage/fix-shadowed-builtins 
Fix shadowed builtins
 2016-09-29 11:25:54 +09:00
Erik Johnson
62729eff8d Update tests to include fix for renamed function 2016-09-28 11:00:33 -05:00
Mike Place
83da81cdfd Merge pull request #36620 from rallytime/fix-36553 
Don't allow mercurial states to return True with errors
 2016-09-28 14:50:50 +09:00
Erik Johnson
283aca8f2a Update test to reflect new function signature 2016-09-27 23:13:19 -05:00
rallytime
90c66ef756 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/aptpkg.py
  - salt/states/service.py
 2016-09-27 21:34:10 -06:00
rallytime
a828bdd0b8 Update test mocks for cmd.run_all dicts 2016-09-27 20:55:39 -06:00
Mike Place
4ab52ae0f6 Merge pull request #36607 from vutny/detect-service-fail 
`salt.states.service`: detect that service failed to start/stop
 2016-09-28 11:39:51 +09:00
Jonathan Ballet
79fdc12395 jinja: fix YAML terminator removal in Jinja's "yaml" filter 2016-09-27 18:52:49 +02:00
Denys Havrysh
c4f899b3b3 salt.states.service: detect that service failed to start/stop 2016-09-27 18:24:37 +03:00
rallytime
d0ec4ead2a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-23 08:32:17 -06:00
Mike Place
654fa8d770 Merge pull request #36280 from jwplayer/feature/2016.3-better-postgresql-grants 
Feature/2016.3 better postgresql grants
 2016-09-23 16:55:32 +09:00
Mike Place
90ef5ce499 Merge pull request #36492 from rallytime/test-fixes-carbon 
The "assert_called_once" mock testing function is only available in mock 2.0.0 or greater
 2016-09-23 00:56:59 +09:00
Mike Place
761ee8b3f6 Merge pull request #36476 from cro/vmware_fix2 
Allow VMware salt-cloud driver to list objects again
 2016-09-22 13:16:40 +09:00
C. R. Oldham
755c069fb9 Align tests for new calls 2016-09-21 16:08:28 -06:00
rallytime
18c6a736cf The "assert_called_once" mock testing function is only available in mock 2.0.0 or greater 
We have a couple of tests using the "assert_called_once" function, however, our salt-jenkins
states pin the version of mock at 1.0.1 (This is the last version that is compatible with
Python 2.6). We either need to use something else that works for all versions of mock or gate
the test.

In the pacman tests, it is possible to use "assert_called_with" instead of "assert_called_once"

In the dimension_data and gce unit tests, we need to gate the assertion behind a mock version check.
This way the tests won't fail if the version of mock installed is less than 2.0.0.
 2016-09-21 14:46:50 -06:00
rallytime
77f8120395 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/installation/windows.rst
  - salt/engines/sqs_events.py
  - salt/grains/core.py
 2016-09-21 10:43:38 -06:00
C. R. Oldham
3c62ceb3b4 Fix salt-cloud breakage--local traversal was skipping what we needed. Fixes #36301 
Align tests for new calls
More specific 'skip' selection for PropertyCollector depending on local_properties request.
 2016-09-21 09:43:14 -06:00
Mike Place
3d23371ca2 Merge pull request #36459 from cachedout/pr-36426 
Pr 36426
 2016-09-21 15:34:28 +09:00
Robert James Hernandez
85d2068326 Refactor for testing and adding related engine tests 2016-09-19 17:10:19 -07:00
Nicole Thomas
2f16e43d67 Update the extend.py and extend_test.py imports (#36382) 
When using `fopen`, we need to import all of salt.utils. We should
also be explicit about calling salt.utils.fopen.

This also cleans up the ordering of the salttesting vs salt libs to
be consistent with other files and conform with `ensure_is_syspath`.

Also changes a print statement to a log.info
 2016-09-16 16:26:13 -06:00
rallytime
0db2b67ed4 Whitespace fix 2016-09-16 13:25:08 -06:00
rallytime
26cf545d03 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/utils/gitfs.py
  - tests/unit/modules/disk_test.py
 2016-09-16 10:35:49 -06:00
rallytime
37aea4188a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-16 09:24:17 -06:00
Nicole Thomas
df9d9b3624 Merge pull request #36355 from rallytime/bp-36288 
Back-port #36288 to 2015.8
 2016-09-16 08:59:47 -06:00
Denys Havrysh
3f308d7694 postgres_extension: report changes when an extension was installed (#36335) 
* postgres_extension: report changes when extension was installed or upgraded

* postgres_extension state: fix unit tests
 2016-09-16 08:23:20 -06:00
Mike Place
70ffdafbf0 Schema test requires jsonschema 2.5.0 or above 2016-09-15 17:23:51 -06:00
Michael Stella
8b877f014d 'All' grants for PostgreSQL. 
This update allows granting privileges on ALL tables or ALL sequences
in a given schema.  Such as:

GRANT SELECT ON ALL TABLES IN SCHEMA public TO 'monkey';
 2016-09-15 17:22:08 -04:00
Michael Stella
fbbe9ec571 Quote postgres privilege target names (#36249) 
* Quote postgres privilege target names

Postgres lets you put characters in table/database names which you then must
quote.  So we should always quote.

* Updating unit tests

* Also quote role names.

Role names can also have dashes (or others) in them, so we must also quote
them.
 2016-09-15 15:12:41 -06:00
Nicole Thomas
a4bbd5e3d7 Add resize2fs unit test from blockdev_test to disk_test (#36346) 
The blockdev module is being slowly deprecated and its functions moved to
to the disk module instead. There is a test for resize2fs in the blockdev_test
file in the 2015.8 branch (which matches the resize2fs function in the blockdev
module), but this function was moved to the disk file in 2016.3. The test was
never moved over.

I discovered this during a merge forward in #36344. This PR adds the
test from 2015.8 blockdev_test to the 2016.3 disk_test.py, and is adjusted
to work with the disk module accordingly.
 2016-09-15 14:37:53 -06:00
Mike Place
340d7fdc53 Schema test requires jsonschema 2.5.0 or above 2016-09-15 12:20:49 -06:00
Pablo Suárez Hernández
dc518c5340 Skip test_resize2fs if resize2fs does not exists (#36325) 2016-09-15 10:14:50 -06:00
Mike Place
f5e37daba9 Merge pull request #36326 from cachedout/fix_extend_test 
Fix extend test
 2016-09-15 20:45:53 +09:00
Mike Place
93f2d108ae Fix extend test 
The test suite can't guarantee what the pwd will be. Pass it into the function under test.
 2016-09-15 20:39:39 +09:00
Mike Place
1cdfad28e8 Give each minion instance a new loop to avoid stale loops 2016-09-15 20:11:12 +09:00
Mike Place
70ea92db95 Safely shutdown the minion 
The test is racing the callback in the minion init.

cc: @rallytime
 2016-09-15 17:51:00 +09:00
Nicole Thomas
729617923e Back-port #36124 to 2016.3 (#36296) 
* Use /etc instead of /root

* Skip test on anything but linux

* Add missing import (lint)
 2016-09-14 10:08:16 -06:00
rallytime
95dbe1ade4 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
 2016-09-14 09:15:29 -06:00
rallytime
57d8bd36ee Pylint fix 2016-09-13 13:27:46 -06:00
rallytime
387ed8bb9f Add unit tests for salt.cache.localfs.py 2016-09-13 10:52:15 -06:00
rallytime
f603757b55 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/mount_test.py
  - tests/unit/states/file_test.py
 2016-09-13 08:21:48 -06:00
Pablo Suárez Hernández
fdf40907b7 Some unit tests fixes (#36227) 
* Prevent tests failures if boto does not exists

* Prevent tests failure if /etc/fstab does not exists
 2016-09-12 11:43:12 -06:00
Mike Place
5ddf0af23e Merge pull request #36166 from jfindlay/parallels 
modules.parallels.delete: allow multiple IDs for same name
 2016-09-12 08:00:56 +09:00
Mike Place
31b2ef2585 Merge pull request #36124 from twangboy/linux_acl_test_mac 
Skip test on all OS's but linux
 2016-09-09 18:59:35 +09:00
rallytime
c30f697dfd Pylint fix 2016-09-08 17:23:15 -06:00
rallytime
6da0fbbe96 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/linux_sysctl.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
  - tests/unit/modules/boto_iot_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/states/boto_iot_test.py
  - tests/unit/utils/network.py
 2016-09-08 16:14:04 -06:00
twangboy
e6b34c414d Add missing import (lint) 2016-09-08 15:37:21 -06:00
Justin Findlay
ad9ce5b4bc modules.parallels: remove redundant state function 
function is redundant with status, which prlctl provides natively
 2016-09-08 14:22:59 -06:00
Justin Findlay
3a97818458 modules.parallels.delete: allow multiple IDs for same name 
When parallels creates linked clones, it generates a new snapshot on the
cloned VM with the name 'Snapshot for linked clone', which when used
with jenkins results in hundreds of unneeded snapshots per week.
 2016-09-08 14:22:26 -06:00
twangboy
bd65259605 Skip test on anything but linux 2016-09-08 13:46:41 -06:00
rallytime
7f955bda0a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/boto_vpc_test.py
  - tests/unit/modules/mount_test.py
  - tests/unit/modules/puppet_test.py
 2016-09-08 10:55:57 -06:00
Mike Place
1f909038f0 Merge pull request #36139 from meaksh/tests-fixes-for-2016.3 
Fixing unit tests for 2016.3
 2016-09-08 22:20:21 +09:00
Pablo Suárez Hernández
52a7ed605e Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 12:39:28 +01:00
Eric Radman
158bcbff65 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 12:39:28 +01:00
Mihai Dincă
8b480167e1 Fix tests (#35693) 
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
 2016-09-08 12:39:28 +01:00
Eric Radman
29814f9d43 Skip utils_test if timelib is not installed (#32699) 
date_cast() throws a RuntimeError, not an ImportError
 2016-09-08 12:39:28 +01:00
Pablo Suárez Hernández
d1d806f893 Fix PortageConfigTestCase in case of portage is not present 2016-09-08 12:39:28 +01:00
Pablo Suárez Hernández
1c260e4bd0 Fix tests to prevent errors when libcloud is not present 2016-09-08 12:39:28 +01:00
Mike Place
f74ca15f50 Remove test for file dir behavior 
Refs #34809
 2016-09-08 11:36:17 +01:00
Eric Radman
c65aefee20 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 11:36:17 +01:00
twangboy
f8c0b439b8 Fixed more lint 2016-09-08 11:36:17 +01:00
twangboy
63ff731009 Fixed tests 2016-09-08 11:36:17 +01:00
Dmitry Kuzmenko
04b1a4a9ca Fixed use of assert_has_calls in tests. 
The method logic was changed in mock-1.1.0.
This mades the use of the method compatible with both <1.1.0 and >=1.1.0
 2016-09-08 11:36:17 +01:00
Dmitry Kuzmenko
46e4bb58e5 Fixed LoadAuthTestCase 2016-09-08 11:36:17 +01:00
rallytime
4e9733ad6d Rename dockerio.py unit tests to dockerio_test.py 
These tests have never run automatically because of an incorrect file name.

Added a skipIf on these tests as they are currently non-functioning and the
module they're testing has been deprecated.
 2016-09-08 11:36:17 +01:00
Pedro Algarvio
ec0cc943e0 Make sure spm tests are picked up by runtests. 
Lists in py2 don't have the clear method
 2016-09-08 11:36:17 +01:00
kstreee
2605f34849 Fix missing first data in stream when subscribing stream using a function 'read_async'. 2016-09-08 11:36:17 +01:00
Pablo Suárez Hernández
305bab8be0 Fixed _interfaces_ifconfig output for SunOS test 2016-09-08 11:36:17 +01:00
Eric Radman
b5ca02c867 Fix tests that assert CommandExecutionError (#32485) 
Trying to assert that an exception was raised using
helper_open.write.assertRaises() is bogus--there is no such method. Use
standard unittest.assertRaises() instead.
 2016-09-08 11:36:17 +01:00
Mihai Dincă
1fb6340fef Fix tests (#35693) 
* Fix tests/unit/modules/useradd_test.py::UserAddTestCase::test_info

* Fix unit/pyobjects_test.py::MapTests::test_map

* Fix tests/unit/pyobjects_test.py::RendererTests::test_extend

* Fix tests/unit/pyobjects_test.py::RendererTests::test_requisite_implicit_list
 2016-09-08 11:36:17 +01:00
Eric Radman
5977f1f54c Skip utils_test if timelib is not installed (#32699) 
date_cast() throws a RuntimeError, not an ImportError
 2016-09-08 11:36:17 +01:00
Pablo Suárez Hernández
d1b9a4061e Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-08 11:36:17 +01:00
Nicole Thomas
7cdbc546f1 Back-port #36062 to 2015.8 (#36118) 
* Comment all lines in the minion config file

* Add unit tests to check for all files in conf/ to be commented out

* Make sure cont/cloud.profiles file is commented out

Matches the cloud.providers file format and other sample config files.

* Add unit tests for sample files in cloud.profiles.d, cloud.providers.d,
and cloud.maps.d

* Make sure all sample config files in cloud.maps.d are commented out

* Make sure all sample config files in cloud.profiles.d are commented out
 2016-09-07 16:01:34 -06:00
rallytime
07172cf371 Add some unit tests for the jid_queue functionality in minion.py 
Refs #35172 and #28785
 2016-09-07 14:15:35 -06:00
twangboy
da2dded3c3 Use /etc instead of /root 2016-09-07 12:34:33 -06:00
rallytime
de4f77cb68 Fixup failing test: need to mock __utils__ instead of salt.utils.cloud call 2016-09-07 08:46:47 -06:00
Mike Place
6460412b1c Merge pull request #36042 from jfindlay/parallels 
add functions to parallels execution module
 2016-09-07 15:09:10 +09:00
Mike Place
4e609a2962 Merge pull request #36062 from rallytime/fix-36045 
Add test to catch sample config files that are not commented out
 2016-09-07 10:30:30 +09:00
rallytime
da25415e2c Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/minion.py
  - salt/modules/gentoo_service.py
  - salt/utils/event.py
  - salt/wheel/key.py
 2016-09-06 11:11:34 -06:00
Pablo Suárez Hernández
71ebf2c8cd Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-06 12:41:56 +01:00
rallytime
dd53a26af5 Add unit tests for sample files in cloud.profiles.d, cloud.providers.d, 
and cloud.maps.d
 2016-09-05 19:11:19 -06:00
rallytime
b04cc62927 Add unit tests to check for all files in conf/ to be commented out 2016-09-05 18:08:02 -06:00
Erik Johnson
3345da0d36 Add tests for gitfs per-saltenv configuration (#29954) 2016-09-03 14:59:04 -05:00
Erik Johnson
c35ed45668 Rename test file so that it runs properly when unit tests are executed 2016-09-03 14:59:04 -05:00
Justin Findlay
430ec201d9 modules.parallels: add exists and state fcns 2016-09-02 15:48:03 -06:00
Justin Findlay
0f7d704eb6 modules.parallels: add clone and delete functions 2016-09-02 15:48:03 -06:00
Justin Findlay
9eb0f637e9 modules.parallels.list_vms: add template arg, update name arg 2016-09-02 15:40:56 -06:00