Commit Graph

10394 Commits

Author SHA1 Message Date
Mike Place
f04888d88f Remove unused import 2017-06-20 12:15:50 -06:00
Dmitry Kuzmenko
ea1a351f5f Code review fixup. 2017-06-20 20:26:58 +03:00
Mike Place
594b7631f7 Merge pull request #41850 from DSRCorporation/bugs/py3_tests_2017.7
Py3 tests fix for 2017.7
2017-06-20 12:17:28 -05:00
Michael Calmer
24bad5b078 translate variable arguments if they contain hidden keywords (bsc#1025896)
- includes a test
2017-06-20 17:28:39 +01:00
Bo Maryniuk
1c817bb6c9 Add zypp-notify plugin
* Add unit test to the libzypp drift detector plugin
2017-06-20 17:18:31 +01:00
Mike Place
f720a849ba Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers
Things, that didn't made to 2017.7 for some reasons
2017-06-20 09:28:21 -05:00
Dmitry Kuzmenko
ea656e92c6 Py3: Disabled augeas test that segfaults the test suite.
Because of a bug in python-augeas:
https://github.com/hercules-team/python-augeas/issues/30
2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
5a1bdd368e Py3: minor tests updates
Correct skipping explanation and correctly disable by proper conditions.
BTW, mysql works on Py3. There's a port of python-mysql and test passes.
2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
2cff18e2ef Py3: fix boto elb test 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
9de940d3d3 Py3: don't use mock.assert_called_once implemented in 3.6. 2017-06-20 16:34:22 +03:00
Dmitry Kuzmenko
e079b4657a Py3: PyDSL test fix. Ignore kwargs order. 2017-06-20 14:29:00 +03:00
garethgreenaway
c1245acaad Merge branch 'develop' into pr-35533 2017-06-19 18:47:29 -07:00
Mike Place
58387b127a Merge pull request #41786 from whiteinge/runner-arg-parsing-regressions
Runner arg parsing regressions
2017-06-19 18:00:06 -05:00
Mike Place
f1def17e8e Merge pull request #41836 from DSRCorporation/bugs/py3_disable_pytest_log_handler
Temporary POC: disable runtests log handler for Py3 tests.
2017-06-19 17:21:42 -05:00
rallytime
add5b118a3 Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/modules/yumpkg.py
  - tests/unit/templates/test_jinja.py
2017-06-19 14:12:36 -06:00
Nicole Thomas
c84a6f36f4 Merge pull request #41808 from gtmanfred/py3
Fix last of the failing mac/py3 tests
2017-06-19 13:57:32 -06:00
Dmitry Kuzmenko
dd4273e268 Temporary POC: disable runtests log handler for Py3 tests. 2017-06-19 22:26:06 +03:00
Mike Place
389a689be9 Merge pull request #41604 from plassa-b/develop
Allow the user to get multiple service statuses at once through globbing
2017-06-19 12:35:59 -05:00
Mike Place
ffb8149de4 Merge pull request #41777 from garethgreenaway/41742_adding_force_option
Additions to lvm module and state module
2017-06-19 11:56:44 -05:00
Mike Place
5bc7a20327 Missing colon 2017-06-19 10:52:45 -06:00
Mike Place
a3efd53371 Merge pull request #41784 from gtmanfred/2017.7
use our own mock_open
2017-06-19 11:25:07 -05:00
Mike Place
8919936244 Merge pull request #41809 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-06-19 10:44:57 -05:00
Mike Place
445f603568 Fix incorrect indentation 2017-06-19 09:37:00 -06:00
Bo Maryniuk
fe97520bc7 Merge branch '2017.7' into isbm-suse-upstream-leftovers 2017-06-19 15:21:13 +02:00
Bo Maryniuk
b08d790ede Lintfix: wrap lines over 120 chars 2017-06-19 14:54:22 +02:00
Bo Maryniuk
25686352bd emove openstack_test UT in favour of test_openstack 2017-06-19 14:03:09 +02:00
Bo Maryniuk
3845c84e65 Remove nova_test UT in favour of test_nova 2017-06-19 14:02:21 +02:00
Bo Maryniuk
6220380c3d Remove an older version of the unit test 2017-06-19 14:00:52 +02:00
Bo Maryniuk
d834bc2c8b Remove old tester. 2017-06-19 13:57:54 +02:00
Nicole Thomas
4dedf01956 Merge pull request #41811 from rallytime/bp-41806
Back-port #41806 to 2017.7
2017-06-16 16:48:39 -06:00
Nicole Thomas
5d0db7b687 Merge pull request #41722 from garethgreenaway/41667_adding_additional_options
Fixes to states/virt.py
2017-06-16 15:24:18 -06:00
Ed Pelc
a536111b83 add tests for single docker log_config option fix 2017-06-16 14:57:17 -06:00
Daniel Wallace
4bf030ff65 don't break py2 2017-06-16 13:11:51 -06:00
rallytime
4780e99ac2 Merge branch '2017.7' into 'develop'
No conflicts.
2017-06-16 11:53:38 -06:00
Ed Pelc
7480bab798 add tests for single docker log_config option fix 2017-06-16 13:05:01 -04:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
2017-06-16 10:43:02 -06:00
jmacfar
dba9558b73 Support cp.get_file|url to download files to a directory
Integrations tests
2017-06-16 10:45:18 -05:00
Daniel Wallace
b65edc786c handle unordered sets in unique jinja tests 2017-06-16 08:40:40 -06:00
Pablo Suárez Hernández
fb444db0f2 Search the entire CACHE_DIR because storage paths change across versions
Prevents zero length error on Python 2.6

Fixes Zypper unit test

Enhances pkg.list_downloaded information of a package

Listing all patches instead of security ones only

Adapting Zypper test to new list_downloaded output

Fixes zypper test error after backporting

Pylint fixes
2017-06-16 15:28:42 +02:00
Pablo Suárez Hernández
27ef83fd62 Adding support for installing patches in yum/dnf execution module
Adding support for installing patches in Zypper module

Adding list_downloaded function to Zypper module

Adding list_downloaded function to Yum module

Adding new pkg.downloaded state

Adding documentation for pkg.downloaded state

Adding pkg.patched and pkg.patch_downloaded states

Check targets for advisory patches installation

Adds support for listing advisory patches with Zypper

Adds support for listing advisory patches with Yum

Improving function naming

Moving advisory ids checks into pkg_resource.parse_targets

Fixes _find_download_targets to call _preflight_check

Fixes parse_targets when advisory id is passed as name

Pylint fixes

Enables pkg.downloaded to verify packages after package manager call.

Adding missing kwargs parameters to pkg.install call

Adding versionadded flags

Some refactoring and minor fixes

Adding unit tests for Zypper execution module

Adding more unit tests for Zypper module

Pylint fix
2017-06-16 15:28:10 +02:00
Peter V. Saveliev
4761e711fe clean up change attribute from interface dict
The attribute is hidden in IPDB from the high-level logics since
pyroute2 version 0.4.2.

Bug-Url: https://github.com/saltstack/salt/issues/41461

unit tests: add pyroute2 interface dict test

Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461

unit tests: fix absolute imports in test_pyroute2

Bug-Url: https://github.com/saltstack/salt/pull/41533

unit tests: add encoding clause into test_pyroute2

Bug-Url: https://github.com/saltstack/salt/pull/41533

unit tests: test_pyroute2 -- add skipIf

... and comments

Bug-Url: https://github.com/saltstack/salt/pull/41533

Update new pyroute2 unit test to conform with 2016.11 branch standards
2017-06-16 14:39:08 +02:00
Michael Calmer
f7cd2f6722 Fix os_family case in unittest 2017-06-16 14:39:08 +02:00
Bo Maryniuk
e9de0746ae Fix grain for os_family on SUSE series 2017-06-16 14:39:08 +02:00
Bo Maryniuk
2d8c9883ff Use correct grain constants for timezone
Adjust the test so it is using the right grain for SUSE systems

Bugfix: use correct grain constant for platform

Refactor with setup/teardown

Add UT for RedHat's set_zone

Fix doc for RH UT

Remove unnecessary mock patch

Doc fix

Add UT for set_zone on SUSE series

Adjust UT to use correct grain for SUSE series

Bugfix: use correct os_family grain value for SUSE series

Add UT for gentoo on set_zone

Add UT for Debian on set_zone

Remove duplicate code

Add UT for get_hwclock on UTC/localtime

Remove dead code

Add UT for get_hwclock on SUSE platform

Bugfix: use correct grain for SUSE and RedHat platform

Add UT for RedHat/SUSE platforms on get_hwclock

Add UT for Debian on get_hwclock

Add UT on Solaris

Add UT for AIX on get_hwclock

Add UT for set_hwclock on AIX

Fix docstrings

Add UT for set_hwclock on solaris

Add UT for set_hwclock on Arch

Add UT for set_hwclock on RedHat

Fix UT names

Add UT set_hwclock on SUSE

Bugfix: use correct grain name for SUSE platform

Add UT for set_hwclock on Debian

Add UT on set_hw_clock on Gentoo

Fix lint issues

Rewrite test case for using no patch decorators

Disable the test for a while

Do not use multiple variables in "with" statement as of lint issues
2017-06-16 14:39:08 +02:00
Bo Maryniuk
23d2aca59b Add unit test for skip false values from preferred_ip
- Add fake preferred IP function for testing
- Add initial unit test for openstack cloud module
- Move out nested function to be unit-testable
- Lintfix
- Add unit test for nova connector
- Move out nested function for testing purposes
- Fix name error exception
- Skip test, if libcloud is not around
- Add unit test for node ip filtering
- Lintfix E0602
- Fix UT parameter changes
- Fix lint, typos and readability
- PEP8: fix unused variable
- Reformat idents, fix typos
- Describe debug information
2017-06-16 14:39:08 +02:00
Piotr Kaźmierczak
ea4d085694 fixing beacons.list integration test failure 2017-06-16 14:39:08 +02:00
Cléry Plassat
a7974fe508 Patched the windows status test 2017-06-16 12:48:15 +02:00
Daniel Wallace
05f2c66604 handle bytes strings in mock_open 2017-06-15 22:43:40 -06:00
Daniel Wallace
4f7c6d1161 use our own mock_open
test.support.mock.mock_open specifies a side effect so that if you constantly
read a mocked open call, it will only iterate through it once, and then after
it will appear as if the end of the file has been reached.

This is needed for salt.modules.cp.push to be tested correctly.
2017-06-15 17:50:35 -06:00
Seth House
9d1cc1a176 Add test to check that runners ignore invalid kwargs
I dunno if this is what we want long-term but this tests current
behavior.
2017-06-15 17:40:38 -06:00
garethgreenaway
899d852791 Merge branch 'develop' into 41742_adding_force_option 2017-06-15 16:07:06 -07:00
garethgreenaway
d41c4ab45b Merge branch 'develop' into 41667_adding_additional_options 2017-06-15 15:54:30 -07:00
Gareth J. Greenaway
87ff0eb3ad Adding the force option for situation where the -yes argument needs to be passed along to lvcreate 2017-06-15 13:39:17 -07:00
Mike Place
9c45fa044d Merge pull request #41748 from terminalmage/issue3415
Add comparison operator support for package installation in yum/dnf and apt
2017-06-15 15:32:37 -05:00
Mike Place
b12611d122 Merge pull request #41617 from cro/n_proxy_tests
Port salt-proxy tests to the testsuite changes in Nitrogen.
2017-06-15 12:07:29 -05:00
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/engines/slack.py
2017-06-15 10:57:27 -06:00
Mike Place
d8b83af3d6 Merge pull request #41745 from terminalmage/fix-runtests-helpers
Fix runtests_helpers.modules_available when multiple modules passed
2017-06-15 10:14:16 -05:00
Mike Place
c58f3811ce Merge pull request #41746 from rallytime/version-added-nitrogen
Update Nitrogen references to 2017.7.0
2017-06-15 10:12:18 -05:00
Mike Place
b0556bd58b Merge branch 'develop' into issue3415 2017-06-15 10:09:46 -05:00
rallytime
b6cc0b6bf0 Manually backport the changes in PR #41615
The automatic back-porting process did't work for this file since the
testing file has been renamed. I manually added the changes to
`timezone_test.py` that were present in PR #41615.
2017-06-15 08:53:25 -06:00
rallytime
33905fd520 Disable new part of test_exit_status_correct_usage test for now
This new part of the test_exit_status_correct_usage test was added
in PR #41382. This test, along with some memory leakage for the
test running in Python 3, has exposed an underlying issue with
Minion._thread_return subprocessing in the test suite. Due to this
issue, this test is extremely flaky.

Per @DmitryKuzmenko's recomendation in https://github.com/saltstack/salt-jenkins/issues/378,
this test should be commented out for the time being. He is planning
on coming back to this issue to uncomment the test once the underlying
problem has been resolved.
2017-06-15 08:44:34 -06:00
garethgreenaway
32a996bdbd Merge branch 'develop' into 41667_adding_additional_options 2017-06-14 16:21:35 -07:00
Nicole Thomas
2c24012ded Merge pull request #41753 from rallytime/bp-41449
Back-port #41449 to 2016.11
2017-06-14 16:16:10 -06:00
Sébastien Wains
fae41c2875 Adjusting SVN unit test 2017-06-14 13:40:50 -06:00
rallytime
d7ecd3c149 Merge branch '2017.7' into 'develop'
No conflicts.
2017-06-14 13:35:50 -06:00
rallytime
16a2747d7d Merge branch '2016.11' into '2017.7'
Conflicts:
  - pkg/windows/buildenv/salt.bat
  - salt/modules/pillar.py
  - salt/utils/openstack/nova.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
  - tests/unit/cloud/clouds/test_gce.py
2017-06-14 13:31:42 -06:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11'
Conflicts:
  - conf/master
  - salt/utils/schedule.py
2017-06-14 13:24:11 -06:00
Erik Johnson
bdaeb55a77 Merge pull request #40902 from lorengordon/pillar-get-merge-lists
Removes duplicates when merging pillar lists and adds pillar.get override for pillar_merge_lists
2017-06-14 13:39:08 -05:00
Erik Johnson
444e45b8e8 Add support for comparison operators to pkg.install (yum/dnf, apt) 2017-06-14 13:21:02 -05:00
rallytime
2b51a20d02 Replace "nitrogen" references with 2017.7.0, too! 2017-06-14 12:20:45 -06:00
Erik Johnson
5c970d81e5 Fix runtests_helpers.modules_available when multiple modules passed
tests.support.helpers passes the single-asterisk tuple of args as
individual arguments to runtest_helpers.modules_available. This breaks
tests which pass more than one argument to the requires_salt_modules
decorator.

This has been fixed by making runtests_helpers.modules_available accept
an arbitrary number of args via using a single-asterisk.
2017-06-14 13:16:30 -05:00
Erik Johnson
23634a305b Fix runtests_helpers.modules_available when multiple modules passed
tests.support.helpers passes the single-asterisk tuple of args as
individual arguments to runtest_helpers.modules_available. This breaks
tests which pass more than one argument to the requires_salt_modules
decorator.

This has been fixed by making runtests_helpers.modules_available accept
an arbitrary number of args via using a single-asterisk.
2017-06-14 13:12:27 -05:00
rallytime
b0145578bf Update Nitrogen references to 2017.7.0 for states, utils, tests directory
Also updated version.py with release tuple
2017-06-14 11:54:27 -06:00
Gareth J. Greenaway
78052ff00e Updating the unit test for libvirt to include coverage for new options 2017-06-14 10:40:06 -07:00
Mike Place
bacdf4e9eb Merge pull request #41449 from sebw/svn-bug-41022
Fix state "svn.latest" diff output in test mode
2017-06-14 12:28:23 -05:00
rallytime
1e9a06000b Bump version check down to 1.4.0 and use distutils.version lib 2017-06-14 09:30:22 -06:00
Loren Gordon
6e35673fe3 Preserves order when removing duplicates 2017-06-13 17:45:08 -04:00
Loren Gordon
18eda7084c Updates list merge tests to check for sorted, unique lists 2017-06-13 17:45:08 -04:00
Mike Place
10b68e9375 Merge pull request #41698 from rallytime/flaky-decorator-tcp-test
Add flaky decorator to test_badload in tcp unit tests
2017-06-13 16:13:44 -05:00
rallytime
74d9a36d5a Merge branch 'nitrogen' into 'develop'
Conflicts:
  - pkg/salt-proxy@.service
  - salt/modules/npm.py
  - salt/modules/parted.py
  - tests/integration/modules/test_libcloud_dns.py
2017-06-13 15:01:51 -06:00
rallytime
a30f654b04 Support apache-libcloud work-around for issue #32743 for versions older than 2.0.0
If apache-libcloud 2.0.0 is installed, the workaround outlined in issue #32743
no longer applies and should be avoided. However, we still need to support older
versions of apache-libcloud that need this work-around.

The minimum version required of apache-libcloud has been updated to 2.0.0 in pull
request #40837, which will released in Oxygen. #40837 has removed all of the
work-arounds needed for issue #32743 for 2.0.0. Until Oxygen is released, however,
we need to support both the work-around for older versions of apache-libcloud as
well as 2.0.0.
2017-06-13 14:22:32 -06:00
rallytime
bdf33d7f5f Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-06-13 09:26:05 -06:00
Nicole Thomas
740e933028 Merge pull request #41703 from gtmanfred/nitrogen
mark all mac power tests as flaky
2017-06-12 16:03:15 -06:00
Daniel Wallace
0fa380f75c npm 5 and greater requires --force for cache clean
This is the error

```
npm ERR! As of npm@5, the npm cache self-heals from corruption issues and
data extracted from the cache is guaranteed to be valid. If you want to make
sure everything is consistent, use 'npm cache verify' instead.

npm ERR!
npm ERR! If you're sure you want to delete the entire cache, rerun this command
with --force.
```
2017-06-12 14:48:43 -06:00
Nicole Thomas
03af4b4e4a Merge branch 'develop' into svn-bug-41022 2017-06-12 14:34:36 -06:00
Daniel Wallace
b202505923 mark all mac power tests as flaky
After talking to @cro, all of the mac power modules became super flaky in
Sierra.  Because of this, I am marking all of the mac power tests with the
flaky decorator.
2017-06-12 13:34:12 -06:00
C. R. Oldham
628f709c3c Correct test--caching requires files on disk but the test just supplies
what would have been read from disk.
2017-06-12 12:55:14 -06:00
rallytime
67f0c17da3 Add flaky decorator to test_badload in tcp unit tests 2017-06-12 11:10:22 -06:00
Nicole Thomas
9cf9cde6da Merge pull request #41666 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-06-12 09:40:47 -06:00
Erik Johnson
a29b458416 Update orphan finding code to handle differences in psutil on PY3
This should fix the remainder of the test flakiness for
integration.shell.test_proxy.ProxyTest.test_exit_status_correct_usage
2017-06-09 15:20:23 -05:00
Gareth J. Greenaway
08a92e041e Removing rogue file that shouldn't be referenced 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
53a216378c Fixing the last text failure. 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
4d3399c6c4 Couple more typos, assert not asset. 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
14a903ef61 Fixing typo in assertSaltTrueReturn, assertSaltFalseReturn and assertSaltNoneReturn. 2017-06-09 09:16:09 -06:00
Gareth J. Greenaway
a531d01b26 Updating the assert tests for develop based on changes from 41569. 2017-06-09 09:16:09 -06:00
garethgreenaway
0717051885 Merge branch 'develop' into develop 2017-06-09 07:55:26 -07:00
Gareth J. Greenaway
0086424787 Removing rogue file that shouldn't be referenced 2017-06-08 20:06:29 -07:00
Gareth J. Greenaway
17ddc9396c Fixing the last text failure. 2017-06-08 20:03:05 -07:00
rallytime
c027f988a7 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-06-08 16:45:48 -06:00
Gareth J. Greenaway
ace175edae Couple more typos, assert not asset. 2017-06-08 15:30:44 -07:00
Art Schneider
1b568a7c7a Fixed cron tests 2017-06-08 16:15:49 -06:00
Nicole Thomas
c292b1161f Lint: quick fix to add missing blank line 2017-06-08 16:04:59 -06:00
Gareth J. Greenaway
e39d05060e Fixing typo in assertSaltTrueReturn, assertSaltFalseReturn and assertSaltNoneReturn. 2017-06-08 14:18:05 -07:00
Gareth J. Greenaway
207dc61405 Updating the assert tests for develop based on changes from 41569. 2017-06-08 14:18:04 -07:00
Sébastien Wains
9ba37fdb37 Merge branch 'develop' into svn-bug-41022 2017-06-08 22:11:30 +02:00
Sébastien Wains
ffdaba0955 Adjusting SVN unit test 2017-06-08 22:10:52 +02:00
Daniel Wallace
5010e1a89d Disable libcloud test if the module doesn't load
This is causing the mac tests to fail.  apache-libcloud 0.20.1 is what is being
imported, and the libcloud_dns module is not being used.
2017-06-08 11:27:24 -06:00
Erik Johnson
0428617b52 Wait for orphans in test_exit_status_correct_usage
Also ensure that the shutdown will be run even when assertions fail
2017-06-08 00:44:52 -05:00
Erik Johnson
cb91437b08 Add wait_for_orphans to testprogram classes
This allows for the shutdown function to also terminate any orphaned
processes which were spawned during the time between when
terminate_process is invoked, and when the processes are actually
killed.
2017-06-08 00:25:53 -05:00
Erik Johnson
846200f11e Include terminate_process_list in import 2017-06-08 00:24:53 -05:00
Nicole Thomas
93a31500c8 Merge branch 'develop' into pillar_top_wildcard 2017-06-07 17:05:06 -06:00
Mike Place
143dad59af Merge pull request #41408 from s0undt3ch/nitrogen
Partially revert 1b84bee06. Fixes #40517
2017-06-07 12:05:25 -05:00
rallytime
396b06fdf8 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-06-07 09:54:20 -06:00
Mike Place
45326ccdec Merge pull request #41621 from gtmanfred/mac
Fix some mac tests
2017-06-07 10:19:25 -05:00
Erik Johnson
913450bd45 Merge pull request #41620 from Ch3LL/skip_mac_git
Skip git_pillar tests on MacOSX
2017-06-07 09:07:01 -05:00
Marlowe W
88bd2bd189 Merge branch 'develop' into pillar_top_wildcard 2017-06-07 09:51:36 +08:00
Nicole Thomas
832b96ea05 Merge pull request #41614 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-06-06 18:42:44 -06:00
rallytime
8aaadd8787 Revert "Update new pyroute2 unit test to conform with 2016.11 branch standards"
This reverts commit 535b8e8d8e.
2017-06-06 16:35:12 -06:00
Ch3LL
0e35605f20
Skip git_pillar tests on MacOSX 2017-06-06 17:17:57 -04:00
Mike Place
8f9ba1f258 Merge pull request #41615 from Ch3LL/fix_mac_clock
Fix get_hwclock_aix test on MacOSX
2017-06-06 15:52:32 -05:00
C. R. Oldham
4540f82aaa Port salt-proxy tests to the testsuite changes in Nitrogen. 2017-06-06 13:49:16 -06:00
Daniel Wallace
b25b487ceb create home directory for issue-1959
Fixes https://github.com/saltstack/salt-jenkins/issues/388
2017-06-06 13:32:57 -06:00
Ch3LL
ea147701f4
Fix get_hwclock_aix test on MacOSX 2017-06-06 15:06:08 -04:00
rallytime
1a40e105e5 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - tests/integration/__init__.py
  - tests/integration/modules/test_state.py
2017-06-06 12:57:44 -06:00
rallytime
2cb4f2baa9 Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/states/keystone.py
2017-06-06 12:50:35 -06:00
Mike Place
53ecb5c4b0 Merge pull request #41553 from terminalmage/issue41527
Fix installing RPMs via remote URLS which are 30x redirects
2017-06-06 13:23:41 -05:00
Daniel Wallace
fd23f7dad3 Mark known flaky mac power test 2017-06-06 12:19:45 -06:00
Mike Place
b720ecb732 Merge pull request #41569 from gtmanfred/fix_test_result_check
Check all entries in result
2017-06-06 13:18:16 -05:00
Ch3LL
8d27bb31b2
Disable home dir check for mac in more test_user tests 2017-06-06 11:20:18 -04:00
Ch3LL
85e77c9cc8
Disable home dir check for mac in test_user 2017-06-06 11:02:19 -04:00
rallytime
535b8e8d8e Update new pyroute2 unit test to conform with 2016.11 branch standards 2017-06-05 20:55:44 -06:00
Nicole Thomas
ebfc9f214a Merge pull request #41594 from Ch3LL/fix_mac_check_cmd
change group to wheel for macosx in tests
2017-06-05 20:45:02 -06:00
Nicole Thomas
be0683de78 Merge pull request #41595 from gtmanfred/nitrogen
Make sure runtests_engine is ASCII text
2017-06-05 20:43:50 -06:00
Nicole Thomas
fa9d7015ca Merge pull request #41589 from Ch3LL/fix_locale_map
Skip locale tests on MacOSX
2017-06-05 20:42:48 -06:00
Mike Place
d7fe4ba7a9 Merge pull request #41592 from terminalmage/py3-tests
Kill child PIDs when shutting down a testprogram daemon
2017-06-05 19:01:49 -05:00
Daniel Wallace
19ea5481b6 remove test that never passed 2017-06-05 17:45:23 -06:00
Daniel Wallace
f309bae8b4 Make sure runtests_engine is ASCII text
If this is has any unicode characters in it, it won't load on systems that do
not default to a unicode locale.

find . -type f | while read line; do ret=$(file $line); if [[ $ret == *UTF-8* && $line == *.py ]]; then echo $line; fi; done

The above will list all files that have unicode characters in it and won't load
with locale set to C or POSIX
2017-06-05 17:30:28 -06:00
Peter V. Saveliev
5c86dee73c unit tests: test_pyroute2 -- add skipIf
... and comments

Bug-Url: https://github.com/saltstack/salt/pull/41533
2017-06-05 17:22:48 -06:00
Peter V. Saveliev
026b39493f unit tests: add encoding clause into test_pyroute2
Bug-Url: https://github.com/saltstack/salt/pull/41533
2017-06-05 17:22:48 -06:00
Peter V. Saveliev
9ab203d54b unit tests: fix absolute imports in test_pyroute2
Bug-Url: https://github.com/saltstack/salt/pull/41533
2017-06-05 17:22:48 -06:00
Peter V. Saveliev
1f507cfa7a unit tests: add pyroute2 interface dict test
Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461
2017-06-05 17:22:48 -06:00
Erik Johnson
8e380679cc Kill child PIDs when shutting down a testprogram daemon
This fixes the test failures recently observed in
integration.shell.test_master.MasterTest.test_exit_status_correct_usage.
The test failures were not a regression, but rather a symptom of a
greater problem with the TestProgram class' shutdown() func. When
terminating the process using the terminate_process helper from
pytest-salt, it does not pass kill_children, which defaults to False.
This makes the helper only kill the main PID, leaving all the other PIDs
running.

This means that every time the integration suite was being run, each
time the TestProgram class was used to spawn a temporary daemon, it
would leave all the child PIDs running when the shutdown() is invoked.

By passing kill_children=True, we ensure that the child PIDs are also
killed. This should provide a significant perfomance improvement in the
test suite.
2017-06-05 16:38:23 -05:00
Ch3LL
ddcb1ca9a7
change group to wheel for macosx in tests 2017-06-05 17:16:54 -04:00
Ch3LL
8c10cbd01d
Skip locale tests on MacOSX 2017-06-05 15:57:20 -04:00
rallytime
903e2f9922 Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-06-05 13:38:51 -06:00
Marlowe W
d50675396d Merge branch 'develop' into pillar_top_wildcard 2017-06-05 13:06:16 +08:00
Nicole Thomas
cc6c98a8d8 Merge pull request #41509 from seanjnkns/fix-keystone-v3-endpoint_present
Add keystone V3 API support for keystone.endpoint_present|absent
2017-06-02 21:01:05 -06:00
Daniel Wallace
e2a4d5e1e2 Check all entries in result
Without this change, we ony check the first return from state tests, if
there is more than one state run, we do not check subsequent tests.
2017-06-02 17:26:07 -06:00
Mike Place
3190b88df0 Merge pull request #41559 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-06-02 10:28:29 -05:00
Nicole Thomas
361fbe629b Merge pull request #41533 from svinota/develop
unit tests: add pyroute2 interface dict test
2017-06-01 17:29:07 -06:00