Commit Graph

8491 Commits

Author SHA1 Message Date
Nicole Thomas
07c9d040c0 Fixup the rabbitmq_user state test failure (#36541) 2016-09-23 15:05:40 -06:00
Nicole Thomas
fcc50c93fc Wrap the entire GrainsAppendTestCase class with destructiveTest (#36537)
Since all pieces of the GrainsAppendTestCase are destructive, let's
just wrap the whole class test case.

Because the tests themselves as well as the `tearDown` function were
wrapped in a @destructiveTest decorator, some test errors were printing
in the test output when --run-destructive isn't passed at the CLI.

This fixes those test errors.
2016-09-23 13:35:05 -06:00
rallytime
d0ec4ead2a Merge branch '2016.3' into 'carbon'
No conflicts.
2016-09-23 08:32:17 -06:00
Alexandru Bleotu
16510be521 Updated tests to reflect changes in salt.utils.vmware.wait_for_pid 2016-09-23 10:48:24 +01:00
Alexandru Bleotu
fa2ecb9f56 Added tests for get_root_folder 2016-09-23 10:09:10 +01: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
rallytime
7fdc73136c Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-22 17:03:24 -06:00
rallytime
8e0b1a3718 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-22 10:09:06 -06:00
rallytime
1755f22de1 Merge branch '2016.3' into 'carbon'
No conflicts.
2016-09-22 10:01:17 -06: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
Mike Place
9d032e0a1b Merge pull request #36481 from terminalmage/fix-mac-non-string-arg-handling
Fix mac non-string arg handling
2016-09-22 13:14:18 +09:00
Mike Place
85907ef008 Merge pull request #36485 from gtmanfred/carbon
clean up keystone tests
2016-09-22 13:12:36 +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
Daniel Wallace
8deb342488 clean up keystone tests
Don't want to overwrite the stuff for the glance tests
2016-09-21 14:43:42 -05:00
Erik Johnson
1c585b0ef6 Leave arguments as integers
This should be supported, and helped catch a bug in the extraneous
re-implementation of cmd.run_all that exists in salt.utils.mac_utils.
2016-09-21 11:46:54 -05: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
rallytime
8805b57a1e Merge branch '2015.8' into '2016.3'
No conflicts.
2016-09-21 09:32:53 -06:00
rallytime
e92478c211 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-21 09:20:42 -06:00
Mike Place
41d3c09857 Merge pull request #35433 from terminalmage/issue34790
git.latest: Add a hint for possible rev changes resulting in non-fast-forward failures
2016-09-21 16:02:18 +09:00
Mike Place
3d23371ca2 Merge pull request #36459 from cachedout/pr-36426
Pr 36426
2016-09-21 15:34:28 +09:00
Mike Place
a41022efc3 Merge pull request #36447 from jfindlay/bp-36431
Backport #36431: Try/except psutil process access in OSX
2016-09-21 14:52:39 +09:00
Mike Place
487aae25b5 Lint 2016-09-20 12:50:39 -06:00
Mike Place
9d2eab47c1 Try/except psutil process access in OSX
Refs https://github.com/saltstack/qa/issues/244
2016-09-20 12:50:39 -06:00
rallytime
7bcbf8dc36 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/faq.rst
  - salt/modules/win_service.py
2016-09-20 10:43:55 -06:00
rallytime
2740fb7bfd Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/grains/core.py
2016-09-20 10:39:53 -06:00
Mike Place
2b49a45768 Merge pull request #36431 from cachedout/psutil_os_x
Try/except psutil process access in OSX
2016-09-20 22:05:42 +09:00
Mike Place
67b78c7d97 Merge pull request #36423 from kraney/boto_apigateway_usage_plan
Boto apigateway usage plan
2016-09-20 15:47:03 +09:00
Mike Place
ae1fc430c2 Merge pull request #36424 from jfindlay/bp-36194
skip some mac_timezone tests
2016-09-20 15:43:47 +09:00
Mike Place
6c1b3f5af4
Lint 2016-09-20 15:40:00 +09:00
Mike Place
d0f44c95f5
Try/except psutil process access in OSX
Refs https://github.com/saltstack/qa/issues/244
2016-09-20 14:35:25 +09:00
Robert James Hernandez
85d2068326 Refactor for testing and adding related engine tests 2016-09-19 17:10:19 -07:00
Justin Findlay
a20a2148bf skip some mac_timezone tests 2016-09-19 16:48:22 -06:00
Winston Liu
df8648d5e3 lint clean up's. 2016-09-19 14:52:41 -07:00
kbelov
632de87807 Merge branch 'boto_apigateway_usage_plan' of https://github.com/kraney/salt into boto_apigateway_usage_plan 2016-09-19 14:38:59 -07:00
kbelov
b61dc5abda added unit tests for boto_apigateway module for usage plans and usage plan associations 2016-09-19 14:37:52 -07:00
Erik Johnson
aab02f28b4 Ensure we have a test venv created using virtualenv < 13.0
The test that runs these states is testing for behavior that was
obsoleted by virtualenv 13.0. Ensure that we have older virtualenv
available, and then create a venv with that older version. Use the
2nd virtualenv to attempt the "weird" install.
2016-09-19 14:27:30 -06:00
Thomas S Hatch
5625827ee2 Merge pull request #36378 from terminalmage/issue36321
git.latest Treat an up-to-date checkout with local changes as up-to-date
2016-09-19 12:43:29 -06:00
Winston Liu
962b0439a5 rest of the unit tests for usage plans related functionality in boto_apigateway module. 2016-09-19 10:54:38 -07:00
rallytime
c64e489f6f Merge branch '2015.8' into '2016.3'
No conflicts.
2016-09-19 11:22:54 -06:00
rallytime
bdb15217d3 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-19 11:21:02 -06:00
Winston Liu
37a0f17191 unit tests for describe/create usage plan. 2016-09-19 09:43:36 -07:00
Erik Johnson
bb4d69f58a git.latest: fail gracefully for misconfigured remote repo (#36391)
* git.latest: fail gracefully for misconfigured remote repo

When the remote repo's HEAD refers to a nonexistent ref, this was
causing a traceback when we tried to check if the upstream tracking
branch needed to be changed after cloning the repo. This commit fixes
this traceback by gracefully failing the state when the remote HEAD is
not present in the ``git ls-remote`` output, but the desired remote
revision doesn't exist.

Additionally, a similar graceful failure now happens if the state is run
again after we gracefully fail the first time, and we need to set the
tracking branch. Trying to set the tracking branch when there is no
local branch would fail with an ambiguous error like "fatal: branch
'master' does not exist", so before we even attempt to set the tracking
branch, the state is failed with a more descriptive comment.

* Add integration test for #36242
2016-09-19 09:33:00 -06:00
Mike Place
6cced56ad3
Lint 2016-09-19 19:08:58 +09:00
Mike Place
db8bef4261
Join in eventassert 2016-09-19 19:02:07 +09:00
Mike Place
d5656e030a
Fast test shutdown 2016-09-19 18:59:03 +09:00
Erik Johnson
71b51f49ba Add integration tests for PR #35433 2016-09-17 22:55:47 -05:00
Erik Johnson
7b1f621206 Fix git.latest test with local changes to reflect changes in state 2016-09-17 21:56:31 -05:00
Mike Place
8b7cfa0a5b Merge pull request #36281 from kraney/boto_elasticsearch
Add support for ElasticsearchVersion parameter
2016-09-17 19:47:00 +09:00
Mike Place
4e40a4f6b1 Merge pull request #36351 from jtand/freebsd_test_fix
Close open socket on freebsd
2016-09-17 19:07:39 +09: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
93d34af667 Merge branch 'carbon' into 'develop'
Conflicts:
  - tests/unit/utils/schema_test.py
2016-09-16 14:38:10 -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
Justin Anderson
b2a1779383 Close open socket on freebsd 2016-09-15 15:37:00 -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
rallytime
47e5d94710 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-15 11:26:09 -06:00
Mike Place
52e9ba4076 Revert "Skip some tests on MacOS" (#36341) 2016-09-15 11:12:04 -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
Thomas S Hatch
d69878127e Merge pull request #36284 from jfindlay/mac_skip
Skip some tests on MacOS
2016-09-15 09:46:30 -06:00
Erik Johnson
d9726f73a7 Remove reference to no-longer-skipped test 2016-09-15 08:57:38 -05:00
Erik Johnson
83cb406cc9 Merge branch 'twangboy-mac_pip_tests' into carbon 2016-09-15 08:56:49 -05:00
Erik Johnson
55fb5f4d2f Merge branch 'mac_pip_tests' of https://github.com/twangboy/salt into twangboy-mac_pip_tests 2016-09-15 08:56:21 -05: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
Erik Johnson
f4dded464c Ensure we have a test venv created using virtualenv < 13.0
The test that runs these states is testing for behavior that was
obsoleted by virtualenv 13.0. Ensure that we have older virtualenv
available, and then create a venv with that older version. Use the
2nd virtualenv to attempt the "weird" install.
2016-09-14 22:42:39 -05:00
rallytime
ee8321eab1 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-14 15:18:22 -06:00
Justin Findlay
30fd9a622a skip pip weird install test 2016-09-14 14:40:43 -06:00
Justin Findlay
d0c4846c89 skip tests that timeout on MacOS
Due to the changes in how the test daemons are handled, it seems.  The
tests fail intermittently.
2016-09-14 14:40:43 -06:00
rallytime
dd1769ea58 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/modules/file.py
  - salt/runners/cloud.py
  - salt/utils/gitfs.py
2016-09-14 13:08:42 -06:00
Nicole Thomas
6a3019bbf1 Merge pull request #36299 from rallytime/gate-pkg-group-installed-test
Gate the pkg.group_installed state test: not all pkg modules have group_install
2016-09-14 13:04:26 -06:00
rallytime
9e15df9b23 Switch the order of the decorator
When @requires_system_grains is listed before other decorators, wrapper
function gets confused on where the grains kwarg should go.
2016-09-14 12:12:21 -06: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
Mike Place
ee997be6d8 Fix pkg group test by passing a list instead of str
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
2016-09-14 09:53:10 -06:00
Kris Raney
0780555fbc Update unit test.
Also, version is reported on status rather than config; update code to reflect that.
2016-09-14 10:40:55 -05:00
rallytime
c7d8867096 Gate the pkg.group_installed state test: not all pkg modules have group_install
Refs #35907
2016-09-14 09:25:56 -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
fb994ad92f Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-14 09:00:05 -06:00
Mike Place
33dcfda715 Merge pull request #36288 from cachedout/fix_schema_test
Schema test requires jsonschema 2.5.0 or above
2016-09-14 19:04:01 +09:00
Mike Place
1357244ef9 Schema test requires jsonschema 2.5.0 or above 2016-09-14 19:03:13 +09:00
Mike Place
dde623bfd5 Fix pkg group test by passing a list instead of str
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
2016-09-14 15:43:39 +09:00
Mike Place
6a76a3a7e0 Merge pull request #36265 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-09-14 14:32:15 +09:00
Mike Place
8119eb6a41 Merge pull request #36269 from gtmanfred/carbon
begin adding tests for the openstack cloud provider
2016-09-14 14:24:42 +09:00
Mike Place
295d58b46a Merge pull request #36276 from rallytime/test-35388
Add unit tests for salt.cache.localfs.py
2016-09-14 14:23:21 +09:00
Pablo Suárez Hernández
ed2d2bd331 Integration tests fixes for 2015.8 (#36262)
* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
2016-09-13 15:24:06 -06:00
Erik Johnson
fd28ca058f Fix for new integration test for fileserver.clear_file_list_cache
The test suite actually has a ``prod`` env, but this test only considers
the ``base`` env. If a test is run which requests a file (or just the
file/dir/symlink/... list) from the ``prod`` env, then this will result
in the ``prod`` env's file list caches being present, and they will be
removed when the ``fileserver.clear_file_list_cache`` runner is
executed, showing up in the return data and causing the test to fail.

This tweak to the test ensures that we will always have a file list
cache for ``prod`` present, and adjusts the necessary asserts in the
test to expect the ``prod`` env in the return data from the runner.
2016-09-13 15:55:51 -05:00
rallytime
57d8bd36ee Pylint fix 2016-09-13 13:27:46 -06:00
Pablo Suárez Hernández
a0bbb0f648 Integration tests fixes for 2016.3 (#36263)
* Fix PillarModuleTest::test_pillar_items: 'info' does not exist in pillar

* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
2016-09-13 12:40:56 -06:00
twangboy
c01ec228e1 Skip weird_install test on Mac OS X 2016-09-13 11:35:38 -06:00
rallytime
387ed8bb9f Add unit tests for salt.cache.localfs.py 2016-09-13 10:52:15 -06:00
Daniel Wallace
2d716131da Add test to check openstack in libcloud
With apache-libcloud 0.20.0
2016-09-13 10:25:43 -05:00
Daniel Wallace
b488cf2420 add __main__ function for keystone test 2016-09-13 10:23:04 -05:00
rallytime
e385f55588 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-13 08:25:11 -06:00
rallytime
e6a412dd49 Merge branch '2016.3' into 'carbon'
No conflicts.
2016-09-13 08:23:51 -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
Mike Place
de06116075 Merge pull request #35688 from cachedout/issue_33525
Splat serializer default configs into the serializer kwargs
2016-09-13 18:21:46 +09:00
Mike Place
3e2375c829 Merge pull request #36176 from twangboy/mac_service_tests
Fix test_launchctl test in mac_service
2016-09-13 16:31:46 +09:00
Mike Place
3833c9e095 Merge pull request #36247 from terminalmage/issue36150
Add a runner function to clear fileserver list caches
2016-09-13 09:17:05 +09:00
Ch3LL
9ede50b451 fix archive test to only run on redhat 2016-09-12 15:43:06 -06:00
Erik Johnson
b7a1a67828 Improve accuracy of fileserver runner tests
The tests that return files, symlinks, directories, and empty dirs were
all only testing that the type of the return data was the same as what
was expected. By not testing the content, we overlooked a corner case in
which backends passed into the fileserver as a Python list would not be
handled properly. This has since been fixed in PR #36244, but these
tests will help keep this sort of issue from regressing.
2016-09-12 16:29:10 -05:00
Erik Johnson
322047a844 Add integration tests for fileserver.clear_file_list_cache 2016-09-12 16:29:10 -05:00
twangboy
4ae8a43435 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-09-12 12:17:30 -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
rallytime
87341ed30b Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-12 09:42:26 -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
1eb67df61e Merge pull request #36198 from gtmanfred/carbon
add keystone state integration tests
2016-09-11 18:16:38 +09:00
mwinnett
b9a98f551e Add win_pki unit tests 2016-09-10 23:31:08 -07:00
Mike Place
7d25344574 Merge pull request #36194 from jfindlay/mac_timezone
skip some mac_timezone tests
2016-09-10 09:07:07 +09:00
Mike Place
81fb34ecd0 Merge pull request #36190 from eradman/openbsdpkg
pkg.install: enable OpenBSD branch and flavor specifications
2016-09-10 09:06:43 +09:00
Christophe Drevet
4c422f1549 fix cron.absent by identifier on test mode (#36181) 2016-09-09 16:20:58 -06:00
Daniel Wallace
1c31d5e464 add keystone state integration tests
fix api_version for using connection_args
2016-09-09 17:14:44 -05:00
twangboy
075ceb09ab Fix test_latest_version test 2016-09-09 14:14:51 -06:00
Megan Wilhite
393bbef63b Add test 35015 (#35945)
* add salt-key eauth tests

* add salt-run with eauth tests

* add method docs

* change expected return
2016-09-09 12:58:50 -06:00
Justin Findlay
eaada10e89 skip some mac_timezone tests 2016-09-09 12:34:24 -06:00
rallytime
167fe00e00 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-09 09:54:17 -06:00
Eric Radman
16e46e36d9 pkg.install: enable OpenBSD branch and flavor specifications
Support OpenBSD branch specification (%)

  ruby%2.3

As well as flavor specification (--)

  vim--gtk2

By default packages are installed using the base flavor and the stable
branch.

Also add unit tests for OpenBSD package management
2016-09-09 11:42:10 -04:00
rallytime
3ed6190ece Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/minion.py
2016-09-09 09:36:57 -06:00
Patrick Valenzuela
b2f1d36e2f Update boto_dynamodb for GSI management and backups (#35878)
* Update boto_dynamodb state/module for GSI management

* fix trailing whitespace

* modify format strings to conform to file style

* fix lint errors

* fix all but 1 test

* add example
2016-09-09 08:57:29 -06:00
twangboy
28442b32f8 Fix some lint 2016-09-09 08:47:51 -06:00
Mike Place
1d5f97d36b Merge pull request #35907 from rallytime/fix-35819
Catch CommandExecutionError when the group in group_installed doesn't exist
2016-09-09 19:14:16 +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
2edfef33ae Merge branch 'carbon' into 'develop'
Conflicts:
  - salt/scripts.py
  - salt/thorium/key.py
  - tests/unit/cloud/clouds/dimensiondata_test.py
  - tests/unit/cloud/clouds/gce_test.py
2016-09-08 17:31:29 -06:00
rallytime
c30f697dfd Pylint fix 2016-09-08 17:23:15 -06:00
twangboy
1c83b37fe6 Fix unquoted integers 2016-09-08 17:07:28 -06:00
twangboy
345cd7f9c1 Fix test_launchctl test 2016-09-08 16:30:35 -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
Thomas S Hatch
93d8a83271 Merge pull request #36086 from twangboy/mac_power_tests
Fix tests for mac_power module on various systems.
2016-09-08 14:52:37 -06:00
Thomas S Hatch
736903222a Merge pull request #36122 from twangboy/mac_system_tests
Fix test not starting, skip broken functions
2016-09-08 14:42:48 -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
Nicole Thomas
0e8e66877a Back-port #36067 to carbon (#36159)
* Fix signal handling

We had a little mix-up with the args ordering for our signal handling.

This sends the proper signal to processes on cleanup.

I have also temporarily disabled the pytest engines because they were
causing the minions to try to to connect to a master IPC socket which could not be found.

This put the minions into a continual futex state which was not playing well with kill sigs.

* Lint
2016-09-08 13:03:12 -06:00
Pablo Suárez Hernández
235d6308a4 Fixing unit tests for develop (#36141)
* Fixing skipped boto tests to prevent errors if boto3 does not exists.

* Fix tests to prevent errors when libcloud is not present

* Fix PortageConfigTestCase in case of portage is not present
2016-09-08 11:15: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
c4e54c853d Merge pull request #36125 from rallytime/test-35172
Add some unit tests for the jid_queue functionality in minion.py
2016-09-08 22:23:32 +09: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