Commit Graph

892 Commits

Author SHA1 Message Date
Daniel Wallace
50bd885ec7
Merge pull request #47107 from twangboy/fix_46932
Fix issues with reg state, add tests
2018-04-18 10:53:01 -05:00
twangboy
ae8ab2ab1a
Fix tests for py3, enable tearDown 2018-04-17 13:59:12 -06:00
Mike Place
ee90dd5d95
Merge branch '2018.3' into issue46909 2018-04-16 16:59:25 -06:00
twangboy
3cf4ac1475
Add integration tests for reg state
Fix issues with binary data found in testing
2018-04-16 14:51:56 -06:00
Erik Johnson
0e99343a7f
Use the same way of defining contents in both file.managed states 2018-04-13 23:07:39 -05:00
rallytime
28a79ebba4
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/win_lgpo.py
  - salt/netapi/rest_tornado/saltnado.py
2018-04-13 12:30:51 -04:00
Erik Johnson
8e214c9fa9
file.managed: Add test to ensure binary contents work 2018-04-12 22:16:56 -05:00
Gareth J. Greenaway
9373dff52b
Update test_pkgrepo.py 2018-04-11 10:55:36 -04:00
Gareth J. Greenaway
13cf9eb5b1
Removing debugging. 2018-04-11 10:55:36 -04:00
Gareth J. Greenaway
a61a8593e5
Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments. 2018-04-11 10:55:36 -04:00
Gareth J. Greenaway
14d12b1d6b
Remove unused imports. Gating tests so they do not run on Windows 2018-04-08 10:39:49 -07:00
Gareth J. Greenaway
c8e01871d6
Adding an integration test to test cron.file. 2018-04-08 10:39:48 -07:00
rallytime
893196d3e6
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/conf.py
  - salt/loader.py
  - salt/modules/dockermod.py
  - salt/modules/sensehat.py
  - salt/utils/parsers.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_cp.py
  - tests/integration/modules/test_groupadd.py
  - tests/integration/spm/test_man_spm.py
  - tests/integration/states/test_npm.py
  - tests/unit/states/test_environ.py
2018-04-03 14:33:11 -04:00
Daniel Wallace
bff61dd291
use http registry for npm
Older versions of npm can't validate the newer certificate.

We don't really need to worry about this, and it would be better to just make
sure the tests run correctly that to use https for the tests.
2018-04-03 09:44:48 -05:00
rallytime
e8864b7b0b
Merge branch '2017.7' into '2018.3' 2018-03-28 13:52:28 -04:00
rallytime
d0278345fc
Update old utils paths to new utils paths 2018-03-27 16:45:16 -04:00
rallytime
e312efb5e7
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
2018-03-27 16:31:55 -04:00
Daniel Wallace
fd0e649d1e
only use npm test work around on newer versions
The workaround only needs to be applied to versions of npm newer than 5.1, but
they work with versions newer than 5.0, so just do all newer versions using the
work around
2018-03-27 13:51:21 -05:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3'
Conflicts:
  - pkg/windows/req.txt
2018-03-27 11:41:56 -04:00
Gareth J. Greenaway
19fd2b621a
Fixing integration tests that were failing. 2018-03-25 17:39:33 -07:00
Nicole Thomas
83ed40c06a
Merge pull request #46619 from rallytime/merge-2017.7
[2017.7] Merge forward from 2017.7.5 to 2017.7
2018-03-20 15:03:29 -04:00
Daniel Wallace
78cbf7b5cd
Fix npm issue
Fixes saltstack/salt-jenkins#884
2018-03-16 09:04:09 -06:00
rallytime
8886b61576
Update old utils paths to new paths 2018-03-15 17:31:29 -04:00
Daniel Wallace
8d5ab72983
virtualenv version too old for python3.6
This test is testing an old version of virtualenv with pip_env, and the version
of pip is 6.x.x, which is too old and doesn't work with the importlib in python
3.6. Skipping this test if python is newer then 3.5.
2018-03-15 12:18:23 -06:00
Erik Johnson
ce391c53f4
Add regression test for #44299 2018-03-13 21:30:14 -05:00
Nicole Thomas
7cdb00ca9c
Merge pull request #46398 from rallytime/merge-2018.3
[2018.3] Merge forward from 2017.7 to 2018.3
2018-03-12 16:25:18 -04:00
Erik Johnson
f9f187e915
Improve reliability/idempotence of file.blockreplace state
This makes the following changes:

- The `append_newline` argument to the `file.blockreplace`
  remote-execution function has been modified so that if its value is
  `None`, it only appends a newline when the content block does not end
  in one.
- A couple of fixes were made to newline handling. The existing code
  normalized the newlines in the content block, replacing them with
  os.linesep. However, when the file contains newlines that don't match
  the OS (i.e. POSIX newlines in a file on a Windows box, or Windows
  newlines on a Linux/Mac/BSD/etc. box), then we would still end up with
  mixed newlines. The line separator is now detected when we read in the
  original file, and the detected line separator is used when writing
  the content block. Additionally, the same newline mismatch was
  possible when appending/prepending the content block. This has been
  fixed by using a common function for appending, prepending, and
  replacing the content block.
- Support for the `append_newline` argument has been added to the
  `file.blockreplace` state. The default value for the state is `None`.
  A `versionchanged` has been added to the remote execution function to
  let users know that the Fluorine release will change the default value
  of that variable.
- 20 new integration tests have been written to test the
  `file.blockreplace` state.
2018-03-07 22:29:39 -06:00
Erik Johnson
4798187035
Improve reliability/idempotence of file.blockreplace state (2018.3 branch)
This makes the following changes:

- The `append_newline` argument to the `file.blockreplace`
  remote-execution function has been modified so that if its value is
  `None`, it only appends a newline when the content block does not end
  in one.
- A couple of fixes were made to newline handling. The existing code
  normalized the newlines in the content block, replacing them with
  os.linesep. However, when the file contains newlines that don't match
  the OS (i.e. POSIX newlines in a file on a Windows box, or Windows
  newlines on a Linux/Mac/BSD/etc. box), then we would still end up with
  mixed newlines. The line separator is now detected when we read in the
  original file, and the detected line separator is used when writing
  the content block. Additionally, the same newline mismatch was
  possible when appending/prepending the content block. This has been
  fixed by using a common function for appending, prepending, and
  replacing the content block.
- Support for the `append_newline` argument has been added to the
  `file.blockreplace` state. The default value for the state is `None`.
  A `versionchanged` has been added to the remote execution function to
  let users know that the Fluorine release will change the default value
  of that variable.
- 20 new integration tests have been written to test the
  `file.blockreplace` state.
2018-03-07 22:29:09 -06:00
rallytime
d83727fdf9
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/cli/api.py
  - salt/client/ssh/wrapper/state.py
  - salt/config/__init__.py
  - salt/crypt.py
  - salt/daemons/masterapi.py
  - salt/key.py
  - salt/loader.py
  - salt/master.py
  - salt/modules/archive.py
  - salt/modules/hipchat.py
  - salt/modules/pip.py
  - salt/modules/state.py
  - salt/modules/virt.py
  - salt/modules/x509.py
  - salt/state.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/__init__.py
  - salt/utils/event.py
  - salt/utils/extmods.py
  - salt/utils/files.py
  - salt/utils/parsers.py
  - salt/utils/verify.py
  - tests/integration/shell/test_call.py
  - tests/unit/utils/test_args.py
2018-03-06 13:45:59 -05:00
Dheeraj Gupta
08d1ee8baf Fix Python3 test errors 2018-02-28 16:44:29 +05:30
Dheeraj Gupta
aa9d709015 Pass env_vars to pip.freeze
pip.installed state calls pip.freeze to check for existing installation
and to verify installation post-install. This patch propagates the
env_vars passed to pip.installed to the pip.freeze function. It also modifies
existing pip unit tests to test new functionality and adds an integration test
that verifies the expected correct behavior

Fixes #46127
2018-02-28 16:44:20 +05:30
Erik Johnson
2035bc8a44
Use unicode normalization to make test work on MacOS 2018-02-15 20:27:44 -06:00
Nicole Thomas
bc13ff8b48
Merge pull request #45941 from terminalmage/issue45679
Fix incorrect translation of docker port_bindings -> ports
2018-02-12 11:28:36 -05:00
Erik Johnson
0ff41c5835
Add regression test for issue 45893 2018-02-09 11:40:22 -05:00
Erik Johnson
9cd47b39dd
Fix incorrect translation of docker port_bindings -> ports
The logic which ensures that we expose ports which are being bound,
even when not explicitly configured, was done incorrectly. UDP ports
were being passed to the API as '1234/udp' instead of (1234, 'udp').
This results in the port not being exposed properly.

The logic has been corrected. Additionally both the "ports" input
translation function, as well as the post-processing code (where the
port numbers configured in port_bindings were being added) both
contained code to "fix" any ports which were configured using
'portnum/tcp', as these must be passed to the API simply as integers. To
reduce code duplication, this normalization is now only performed at the
very end of the post-processing function, after ports have been
translated, and any missing ports from the port_bindings have been
added.

The unit test for the port_bindings input translation code, which was
written based upon the same incorrect reading of the API docs that
resulted in the incorrect behavior, have been updated to confirm the
(now) correct behavior. The unit test for the ports input translation
code has been updated to reflect the new normalization behavior.

Finally, an integration test has been added to ensure that we properly
expose UDP ports which are added as part of the post-processing
function.
2018-02-08 23:23:43 -06:00
Erik Johnson
f35d9f6fef
Fix incorrect translation of docker port_bindings -> ports
The logic which ensures that we expose ports which are being bound,
even when not explicitly configured, was done incorrectly. UDP ports
were being passed to the API as '1234/udp' instead of (1234, 'udp').
This results in the port not being exposed properly.

The logic has been corrected. Additionally both the "ports" input
translation function, as well as the post-processing code (where the
port numbers configured in port_bindings were being added) both
contained code to "fix" any ports which were configured using
'portnum/tcp', as these must be passed to the API simply as integers. To
reduce code duplication, this normalization is now only performed at the
very end of the post-processing function, after ports have been
translated, and any missing ports from the port_bindings have been
added.

The unit test for the port_bindings input translation code, which was
written based upon the same incorrect reading of the API docs that
resulted in the incorrect behavior, have been updated to confirm the
(now) correct behavior. The unit test for the ports input translation
code has been updated to reflect the new normalization behavior.

Finally, an integration test has been added to ensure that we properly
expose UDP ports which are added as part of the post-processing
function.
2018-02-08 23:22:43 -06:00
Erik Johnson
9d200efc26
Add regression test for issue 45893 2018-02-07 14:32:59 -06:00
Erik Johnson
0d92e0a868
Add a test for issue 40578 2018-01-30 09:51:51 -06:00
rallytime
0ad101d560
Merge branch '2017.7' into 'oxygen'
Conflicts:
  - doc/man/salt.7
  - salt/modules/git.py
  - salt/modules/pacman.py
  - salt/states/git.py
  - tests/integration/modules/test_mac_user.py
  - tests/support/parser/__init__.py
2018-01-26 17:27:03 -05:00
Gareth J. Greenaway
b3c1be27fb
Tier two unicode updates for modules, states and related tests. 2018-01-25 11:59:25 -08:00
Nicole Thomas
2a562243b6
Merge pull request #45541 from terminalmage/py3-tier1
[PY3] Add unicode_literals to high-priority modules/states
2018-01-24 16:54:24 -05:00
Erik Johnson
9c86cd627a
[PY3] Add unicode_literals to high-priority modules/states 2018-01-24 10:33:58 -06:00
Erik Johnson
d6d7da5c90
Replace all usage of six.b
It can't be trusted to produce bytes, it returns unicode when a unicode
string is passed.
2018-01-24 09:17:28 -06:00
Nicole Thomas
fa373e658e
Merge pull request #45476 from rallytime/unicode-h
Add unicode_literals to modules, states, tests (H)
2018-01-24 09:15:40 -05:00
Nicole Thomas
d5cedf6d81
Merge pull request #45560 from rallytime/unicode-changes-1
Add unicode_literals to modules, states, and related tests
2018-01-24 09:13:58 -05:00
Nicole Thomas
a5abe5be68
Merge pull request #45594 from garethgreenaway/tier_three_unicode_modules_state_updates
[oxygen] Tier three Unicode modules state updates
2018-01-24 09:12:01 -05:00
Nicole Thomas
c290b6320b
Merge pull request #45634 from Ch3LL/mac-service
Add different service name for Mac 10.13 test
2018-01-23 16:51:56 -05:00
rallytime
c08c67f3d4
Add unicode_literals to modules, states, and related tests 2018-01-23 15:26:25 -05:00
Gareth J. Greenaway
49d0d1f1a5
Updating various modules, states and related tests for Unicode fun & profit part one. 2018-01-23 11:53:16 -08:00
rallytime
583a89ca6f
Update old utils paths to new paths 2018-01-23 13:34:24 -05:00