Commit Graph

10039 Commits

Author SHA1 Message Date
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
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
445f603568 Fix incorrect indentation 2017-06-19 09:37:00 -06: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
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
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
Daniel Wallace
b65edc786c handle unordered sets in unique jinja tests 2017-06-16 08:40:40 -06: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
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
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
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
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
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
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
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
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
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
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
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
Nicole Thomas
c292b1161f Lint: quick fix to add missing blank line 2017-06-08 16:04:59 -06: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
Mike Place
143dad59af Merge pull request #41408 from s0undt3ch/nitrogen
Partially revert 1b84bee06. Fixes #40517
2017-06-07 12:05:25 -05: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
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