Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Porting #50261 to master - beacons #55794

Merged
merged 80 commits into from Jan 21, 2020
Merged

[master] Porting #50261 to master - beacons #55794

merged 80 commits into from Jan 21, 2020

Conversation

garethgreenaway
Copy link
Member

@garethgreenaway garethgreenaway commented Jan 6, 2020

What does this PR do?

Porting #50261 to master

Tests written?

[NOTICE] Bug fixes or features added to Salt require tests.
Please review the test documentation for details on how to implement tests into Salt's test suite.
Yes

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@garethgreenaway garethgreenaway requested a review from as a code owner Jan 6, 2020
@ghost ghost requested a review from dwoz Jan 6, 2020
@dwoz
Copy link
Contributor

@dwoz dwoz commented Jan 7, 2020

@garethgreenaway Test failures seem to be valid.

@max-arnold
Copy link
Contributor

@max-arnold max-arnold commented Jan 7, 2020

Could you please also backport the multi-engine PR? #50059

@garethgreenaway
Copy link
Member Author

@garethgreenaway garethgreenaway commented Jan 9, 2020

@max-arnold thanks. I'll get that one ported over as well.

garethgreenaway and others added 22 commits Jan 11, 2020
@garethgreenaway
Fixing failing tests.
9bc5840
@garethgreenaway
Merge branch 'master_port_50261' of github.com:garethgreenaway/salt i…
99ba268 
…nto master_port_50261
@garethgreenaway
Merge branch 'master' into master_port_50261
5ff43cd
@garethgreenaway
Fixing failed test, using a copy of the default minion opts.
0e7f1cd
@garethgreenaway
Merge branch 'master_port_50261' of github.com:garethgreenaway/salt i…
112cfde 
…nto master_port_50261
@Akm0d
Refactor the mac group tests
680790a 
 - Simplify setup and teardown logic with user/group.present/absent
 - Added a function for asserting salt-call with no return code
 - Skip tests if required modules and states aren't available
@garethgreenaway
various netapi fixes and tests
c3a8914
update neon reference
ba38ff7
Update 2016.11.9.rst
17cc901
Update 2016.11.9.rst
0b1ff5f
Update 2017.7.3.rst
79c06b4
Update 2018.3.1.rst
3dca9c6
Update 2018.3.3.rst
ae738c9
Update bootstrap-salt.sh
9e71145
Update core.py
95933bb
Update aptpkg.py
0fb7fe9
Update bootstrap-salt.sh
ad0ad88
Merge branch 'master' into update_neon_reference
eccd651
Update index.rst
af48a70
Update man pages 3000
c839d82
@s0undt3ch @garethgreenaway
Update to latest unittest-xml-reporting. Fix missing .fileno method.
6878111
@s0undt3ch @garethgreenaway
Update to latest unittest-xml-reporting. Fix missing .fileno method.
f401ffd
@garethgreenaway garethgreenaway changed the title [master] Porting #50261 to master [master] Porting #50261 to master - beacons Jan 17, 2020
dwoz and others added 23 commits Jan 17, 2020
@dwoz
Merge pull request saltstack#55903 from bryceml/make_docs_build_using…
9ac235a 
…_environment_variables_for_releases

set release versions with environment variables in the docs
Fix conflicts
c9d33b2
Merge branch 'master' into fix_win_reg
fb3ac84
Neon to 3000
9e098e4
Merge branch 'fix_win_reg' of https://github.com/twangboy/salt into f…
4f4aac3 
…ix_win_reg
@dwoz
Merge pull request saltstack#55893 from twangboy/fix_win_reg
51adb38 
Remove references to `include_default`
@garethgreenaway
Renaming beacon/log.py to beacon/log_beacon.py to avoid conflicts whe…
e7fc884 
…n importing logging during tests.
@garethgreenaway
Removing unneeded testing code.
142bed8
@garethgreenaway
Porting saltstack#50261 to master.
6fea47f
@garethgreenaway
Porting saltstack#50261 to master.
3969b98
@garethgreenaway
Fixing failing tests.
8768608
@dwoz @garethgreenaway
Linter fixes
f294035
@garethgreenaway
Fixing failed test, using a copy of the default minion opts.
4b2cbeb
@garethgreenaway
Removing logging import to test if this resolves the test failure.
8b78daa
@garethgreenaway
Porting saltstack#50261 to master.
9996bc1
@garethgreenaway
Fixing failing tests.
3140dbe
@dwoz @garethgreenaway
Linter fixes
80b65ef
@garethgreenaway
Fixing failed test, using a copy of the default minion opts.
f6fb381
@garethgreenaway
Importing salt.log.setup so hopefully we have access to log.trace.
42e96b6
@garethgreenaway
Adding some code to make sure log.trace is available.
abe139e
@garethgreenaway
Renaming beacon/log.py to beacon/log_beacon.py to avoid conflicts whe…
a367f6a 
…n importing logging during tests.
@garethgreenaway
Removing unneeded testing code.
2f5a3c7
@garethgreenaway
Merge branch 'master_port_50261' of github.com:garethgreenaway/salt i…
c39d2d3 
…nto master_port_50261
@codecov
Copy link

@codecov codecov bot commented Jan 19, 2020

Codecov Report

❗ No coverage uploaded for pull request base (master@3140dbe). Click here to learn what that means.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #55794   +/-   ##
=========================================
  Coverage          ?   16.99%           
=========================================
  Files             ?     1202           
  Lines             ?   224685           
  Branches          ?    49269           
=========================================
  Hits              ?    38172           
  Misses            ?   183757           
  Partials          ?     2756
Flag Coverage Δ
#archlts 16.25% <0%> (?)
#centos7 23.76% <0%> (?)
#proxy 23.79% <0%> (?)
#py2 16.84% <0%> (?)
#py3 16.69% <0%> (?)
#runtests 16.99% <0%> (?)
#ubuntu1604 23.73% <0%> (?)
#zeromq 16.99% <0%> (?)
Impacted Files Coverage Δ
salt/modules/beacons.py 7.29% <0%> (ø)
salt/beacons/__init__.py 13.74% <0%> (ø)

1 similar comment
@codecov
Copy link

@codecov codecov bot commented Jan 19, 2020

Codecov Report

❗ No coverage uploaded for pull request base (master@3140dbe). Click here to learn what that means.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #55794   +/-   ##
=========================================
  Coverage          ?   16.99%           
=========================================
  Files             ?     1202           
  Lines             ?   224685           
  Branches          ?    49269           
=========================================
  Hits              ?    38172           
  Misses            ?   183757           
  Partials          ?     2756
Flag Coverage Δ
#archlts 16.25% <0%> (?)
#centos7 23.76% <0%> (?)
#proxy 23.79% <0%> (?)
#py2 16.84% <0%> (?)
#py3 16.69% <0%> (?)
#runtests 16.99% <0%> (?)
#ubuntu1604 23.73% <0%> (?)
#zeromq 16.99% <0%> (?)
Impacted Files Coverage Δ
salt/modules/beacons.py 7.29% <0%> (ø)
salt/beacons/__init__.py 13.74% <0%> (ø)

@garethgreenaway
Renaming test_log.py to test_log_beacon.py to fix unit.test_module_na…
4f1880f 
…mes.BadTestModuleNamesTestCase.test_module_name_source_match failure.
dwoz
dwoz approved these changes Jan 21, 2020
View changes
@dwoz dwoz merged commit 7f384df into saltstack:master Jan 21, 2020
49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dwoz dwoz

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@garethgreenaway @dwoz @max-arnold @Akm0d @s0undt3ch