[2019.2] Merge forward from 2018.3 to 2019.2 #52528

Ch3LL · 2019-04-12T16:34:39Z

Conflicts:

tests/unit/transport/test_ipc.py

Reverts PR 51095 Checks for null characters

Rather than using `grains.items`, `test.arg` is less common, and specifiying a value that isn't currently used anywhere else should eliminate any chance of race condition for this test.

Since refresh_db is a costly operation we should have the option of not calling that Signed-off-by: Cristian Hotea <[email protected]>

Pygit2 version 0.26.2 added support for pruning when fetching. In this way Pygit2 provider will no longer need to leverage git commanand line utility for pruning the remote. Signed-off-by: Cristian Hotea <[email protected]>

Pkgrepo state module is using a named argument when calling pkg.del_repo. Change the name of the argument from 'alias' to 'repo' and update all other functions to be consistent on naming. Signed-off-by: Cristian Hotea <[email protected]>

python exposes an nt.environ for case insensitive environment behavior that is native to windows; so it makes sense to use this instead of os.environ to avoid enexpected behavior and failure. further detail: https://bugs.python.org/issue28824

Simplify IPCClient and prevent corrupt messages

…-enhancements Use uncommon item in mine delete test

Backport saltstack#49984 into 2018.3

2018.3 backport saltstack#52472 modules.cmdmod: handle windows environ better

When the source is procedurally generated (e.g. from the result of a remote execution function call), and that source ends up being an empty string or some other invalid value, the call to `file.source_list` will return a path of `None` which will cause a `TypeError` later on when we try to run a urlparse on it.

this change was introduced to address evidently another bug where somehow self.opts has no master_uri - but in the process it prioritized using master_ip over master_uri even when master_uri _is_ there. providing master_uri as a way of specifiying which msater you would like to create a channel for is documented used elsewhere in the codebase in multi-master scenarios (ie, event.send, saltutil.revoke_auth)

Prefix any output with ERROR on non 0 exit code because that's what the supervisord state checks for.

Backport saltstack#49464 into 2018.3

[2018.3] Fix supervisord

2018.3: transport.zmq: fix bug introduced by b7df7e7

Fix ping reaction test

Backport saltstack#49437 into 2018.3

Altered code to support salt-ssh on AIX

Use registry to get timezone

Handle Chocolatey's new Enhanced Exit Codes

Conflicts: - tests/unit/transport/test_ipc.py

codecov · 2019-04-13T01:43:43Z

Codecov Report

❗ No coverage uploaded for pull request base (2019.2@2c42e4d). Click here to learn what that means.
The diff coverage is 56.31%.

@@            Coverage Diff            @@
##             2019.2   #52528   +/-   ##
=========================================
  Coverage          ?   48.97%           
=========================================
  Files             ?     1511           
  Lines             ?   256900           
  Branches          ?    55634           
=========================================
  Hits              ?   125812           
  Misses            ?   130791           
  Partials          ?      297

Flag	Coverage Δ
#arch	`0.72% <11.65%> (?)`
#debian8	`45.43% <44.66%> (?)`
#fedora29	`30.29% <31.06%> (?)`
#m2crypto	`45.46% <50.48%> (?)`
#opensuse42	`32.28% <27.18%> (?)`
#py2	`32.57% <33.98%> (?)`
#py3	`32.65% <31.06%> (?)`
#ubuntu1604	`45.46% <50.48%> (?)`
#windows2019	`0% <0%> (?)`

Impacted Files	Coverage Δ
salt/utils/gitfs.py	`64.69% <100%> (ø)`
salt/modules/chocolatey.py	`39.79% <100%> (ø)`
salt/modules/win_timezone.py	`78.48% <100%> (ø)`
salt/client/ssh/ssh_py_shim.py	`18.75% <100%> (ø)`
salt/states/archive.py	`48.19% <25%> (ø)`
salt/utils/rsax931.py	`89.77% <33.33%> (ø)`
salt/modules/cmdmod.py	`55.58% <37.5%> (ø)`
salt/transport/ipc.py	`59.83% <46.66%> (ø)`
salt/transport/zeromq.py	`65.45% <50%> (ø)`
salt/modules/opkg.py	`35.71% <53.33%> (ø)`
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2c42e4d...048a82e. Read the comment docs.

codecov · 2019-04-13T01:43:44Z

Codecov Report

❗ No coverage uploaded for pull request base (2019.2@2c42e4d). Click here to learn what that means.
The diff coverage is 56.31%.

@@            Coverage Diff            @@
##             2019.2   #52528   +/-   ##
=========================================
  Coverage          ?   48.97%           
=========================================
  Files             ?     1511           
  Lines             ?   256900           
  Branches          ?    55634           
=========================================
  Hits              ?   125812           
  Misses            ?   130791           
  Partials          ?      297

Flag	Coverage Δ
#arch	`0.72% <11.65%> (?)`
#debian8	`45.43% <44.66%> (?)`
#fedora29	`30.29% <31.06%> (?)`
#m2crypto	`45.46% <50.48%> (?)`
#opensuse42	`32.28% <27.18%> (?)`
#py2	`32.57% <33.98%> (?)`
#py3	`32.65% <31.06%> (?)`
#ubuntu1604	`45.46% <50.48%> (?)`
#windows2019	`0% <0%> (?)`

Impacted Files	Coverage Δ
salt/utils/gitfs.py	`64.69% <100%> (ø)`
salt/modules/chocolatey.py	`39.79% <100%> (ø)`
salt/modules/win_timezone.py	`78.48% <100%> (ø)`
salt/client/ssh/ssh_py_shim.py	`18.75% <100%> (ø)`
salt/states/archive.py	`48.19% <25%> (ø)`
salt/utils/rsax931.py	`89.77% <33.33%> (ø)`
salt/modules/cmdmod.py	`55.58% <37.5%> (ø)`
salt/transport/ipc.py	`59.83% <46.66%> (ø)`
salt/transport/zeromq.py	`65.45% <50%> (ø)`
salt/modules/opkg.py	`35.71% <53.33%> (ø)`
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2c42e4d...048a82e. Read the comment docs.

dwoz

We don't want to merge with failing tests but these Windows PY3 tests are failing sporadically. We're going to tackle these after the first branch builds run on 2019.2.1

twangboy and others added 30 commits March 7, 2019 16:16

Revert back to using reg to get timezone

59b1d4f

Reverts PR 51095 Checks for null characters

Fix tests, add null byte test

9a8afa6

Merge branch '2018.3' into use_reg_timezone

34bdae5

Merge branch '2018.3' into use_reg_timezone

b466f8a

Merge branch '2018.3' into use_reg_timezone

1bf0cbc

Handle new enhanced retcode 2

bfdc47b

Merge branch '2018.3' into fix_choco_retcode

7aec2d3

Merge branch '2018.3' into use_reg_timezone

d0987e6

Use uncommon item in mine delete test

e3f5be3

Rather than using `grains.items`, `test.arg` is less common, and specifiying a value that isn't currently used anywhere else should eliminate any chance of race condition for this test.

Altered code to support salt-ssh on AIX

6d98577

Correct typo

8bfa340

Re-raise queued exceptions with traceback

b374034

Remove IPCClient singleton

503cdd2

Fix linter issues

2b35437

Fix ipc unit tests

47203f7

Close message service on subscriber close

29999b0

Use six.reraise for py3 compatability

c7ad732

Ensure exceptions in service future are handled

1bdaf29

Add support to avoid calling refresh_db in opkg.del_repo

f66d474

Since refresh_db is a costly operation we should have the option of not calling that Signed-off-by: Cristian Hotea <[email protected]>

Use prune option in Pygit2 provider when fetching

c8d547e

Pygit2 version 0.26.2 added support for pruning when fetching. In this way Pygit2 provider will no longer need to leverage git commanand line utility for pruning the remote. Signed-off-by: Cristian Hotea <[email protected]>

Merge pull request saltstack#52445 from dwoz/ipc_fixes_2018.3

89bd258

Simplify IPCClient and prevent corrupt messages

Merge pull request saltstack#52393 from waynew/52087-mine-delete-test…

d699485

…-enhancements Use uncommon item in mine delete test

Merge pull request saltstack#52474 from Ch3LL/bp-49984

4dfb2f8

Backport saltstack#49984 into 2018.3

Merge pull request saltstack#52476 from bloomberg/win_cmd_2018

2df74ca

2018.3 backport saltstack#52472 modules.cmdmod: handle windows environ better

fix reactor ping test

e3e1d2e

fix linter

75ddeb3

Merge branch '2018.3' into ping_reaction_test

7c963c1

mattp- and others added 16 commits April 11, 2019 13:58

Merge branch '2018.3' into bp-49437

48ee82d

The exit code matters.

cd5cd7d

Prefix any output with ERROR on non 0 exit code because that's what the supervisord state checks for.

Merge pull request saltstack#52475 from Ch3LL/bp-49464

53228ae

Backport saltstack#49464 into 2018.3

Merge branch '2018.3' into bp-49437

bbfd412

Fix merge conflict wart

3a3114d

Merge pull request saltstack#52512 from dwoz/supervisord_2018.3

452bbeb

[2018.3] Fix supervisord

Merge branch '2018.3' into ping_reaction_test

8b05e77

Merge branch '2018.3' into bp-49437

781385f

Merge pull request saltstack#52505 from bloomberg/2018_zmq_uri

9b7a0d1

2018.3: transport.zmq: fix bug introduced by b7df7e7

Merge pull request saltstack#52493 from dwoz/ping_reaction_test

d830bc6

Fix ping reaction test

Merge pull request saltstack#52473 from Ch3LL/bp-49437

576478e

Backport saltstack#49437 into 2018.3

Merge pull request saltstack#52396 from dmurphy18/fix_aix_ssh

0d09608

Altered code to support salt-ssh on AIX

Merge pull request saltstack#52046 from twangboy/use_reg_timezone

dd7a4ba

Use registry to get timezone

Merge pull request saltstack#52209 from twangboy/fix_choco_retcode

262516c

Handle Chocolatey's new Enhanced Exit Codes

Merge branch '2018.3' into '2019.2'

2941567

Conflicts: - tests/unit/transport/test_ipc.py

garethgreenaway approved these changes Apr 12, 2019

View reviewed changes

Ch3LL added 3 commits April 12, 2019 19:50

Fix linux state tests- add new comment

c70772c

Fix windows tests - increase timeout

795a7f6

Merge branch '2019.2' into merge-2019.2

048a82e

Ch3LL added 4 commits April 15, 2019 12:14

Fix pylint and state test failure

474efa1

Merge branch '2019.2' into merge-2019.2

2c3ff2f

Increase timeout for test_kwarg tests

3442202

increase timeout on test_state for windows

87cf385

dwoz approved these changes Apr 17, 2019

View reviewed changes

dwoz merged commit cc0cd5d into saltstack:2019.2 Apr 17, 2019

Ch3LL mentioned this pull request Apr 17, 2019

integration.modules.test_state test failures #52509

Closed

Ch3LL deleted the merge-2019.2 branch April 18, 2019 15:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[2019.2] Merge forward from 2018.3 to 2019.2 #52528

[2019.2] Merge forward from 2018.3 to 2019.2 #52528

Ch3LL commented Apr 12, 2019

codecov bot commented Apr 13, 2019

codecov bot commented Apr 13, 2019

dwoz left a comment

[2019.2] Merge forward from 2018.3 to 2019.2 #52528

[2019.2] Merge forward from 2018.3 to 2019.2 #52528

Conversation

Ch3LL commented Apr 12, 2019

codecov bot commented Apr 13, 2019

Codecov Report

codecov bot commented Apr 13, 2019

Codecov Report

dwoz left a comment

Choose a reason for hiding this comment