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

Backports git_pillar tests improvements to 2018.3 #50427

Merged
merged 3 commits into from Nov 16, 2018

Conversation

Projects
None yet
5 participants
@sathieu
Copy link
Contributor

commented Nov 8, 2018

What does this PR do?

Backports of #50378, #50407 and #50425.

What issues does this PR fix or reference?

#50378, #50407 and #50425.

Tests written?

Yes. Improved coverage

Commits signed with GPG?

Yes

@cachedout cachedout requested a review from terminalmage Nov 8, 2018

@cachedout

This comment has been minimized.

Copy link
Collaborator

commented Nov 8, 2018

@sathieu I'm afraid there are some merge conflicts which need to be resolved before we can get this in. Could you please take a look?

@sathieu sathieu force-pushed the sathieu:bp-git_pillar_tests branch 2 times, most recently from e23748c to b2dac8e Nov 9, 2018

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Nov 9, 2018

I've ended up using:

git fetch orign
git format-patch HEAD^^^
git reset --hard origin/2018.3
git am -S      0001-Don-t-fail-on-git_pillar-tests-when-destructive-test.patch
git am -S -C 1 0002-git_pillar-Add-tests-for-root-parameter.patch
git am -S -C 1 0003-git_pillar-Add-tests-for-mountpoint-parameter.patch

I looks like I only needed to do:

git fetch orign
git rebase -S -C 1 origin/2018.3
@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Nov 9, 2018

It looks like #50417 broke my tests.

This is what I got too when I tested #50417 on our qa (we use mountpoints). @meaksh any idea?

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Nov 9, 2018

Reverting 59894e2. doesn't fix the tests ...

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Nov 9, 2018

Reverting 59894e2. doesn't fix the tests ...

... but reverting the whole #50417 does. 🤔

@meaksh

This comment has been minimized.

Copy link
Member

commented Nov 9, 2018

@sathieu - I fixed the issue you have here. It seems Git messed up when you rebased your changes with latest 2018.3 branch.

I've created a PR to your PR sathieu#1 😄

@sathieu sathieu force-pushed the sathieu:bp-git_pillar_tests branch from b2dac8e to 3af329d Nov 10, 2018

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Nov 10, 2018

@sathieu - I fixed the issue you have here. It seems Git messed up when you rebased your changes with latest 2018.3 branch.

I've created a PR to your PR sathieu#1 smile

Yes. Thanks! I've squashed your commit for clean history.

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Nov 14, 2018

@sathieu There is a related test failure here: https://jenkinsci.saltstack.com/job/pr-kitchen-ubuntu1604-py2/job/PR-50427/5/

Can you take a look?

@sathieu sathieu force-pushed the sathieu:bp-git_pillar_tests branch from 3af329d to ad67d78 Nov 15, 2018

@sathieu

This comment has been minimized.

Copy link
Contributor Author

commented Nov 15, 2018

@rallytime: fixed (a root param was missing)

sathieu added some commits Nov 5, 2018

Don't fail on git_pillar tests when destructive tests are not enable
This fixes the following when running `python tests/runtests.py --ext-pillar`:

 --------  Tests with Errors  ------------------------------------------------------------------------------------------------------------------------
   -> tearDownClass (integration.pillar.test_git_pillar.TestGitPythonSSH)  ...........................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
   -> tearDownClass (integration.pillar.test_git_pillar.TestPygit2SSH)  ..............................................................................
       Traceback (most recent call last):
         File ".../salt/tests/support/gitfs.py", line 481, in tearDownClass
           if cls.case.sshd_proc is not None:
       AttributeError: 'NoneType' object has no attribute 'sshd_proc'
   ...................................................................................................................................................
 -----------------------------------------------------------------------------------------------------------------------------------------------------

Signed-off-by: Mathieu Parent <math.parent@gmail.com>
(cherry picked from commit 84e9fce)
git_pillar: Add tests for root parameter
(cherry picked from commit 2e88b74)

@sathieu sathieu force-pushed the sathieu:bp-git_pillar_tests branch from ad67d78 to 12ea1cc Nov 16, 2018

@terminalmage terminalmage merged commit 84edd62 into saltstack:2018.3 Nov 16, 2018

10 checks passed

WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details

@sathieu sathieu deleted the sathieu:bp-git_pillar_tests branch Dec 7, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.