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

Add spm tests to Windows suite #49875

Merged
merged 3 commits into from Oct 5, 2018

Conversation

Projects
None yet
4 participants
@dwoz
Copy link
Contributor

commented Oct 3, 2018

What does this PR do?

  • Adds integration.spm.* tests to whitelist.txt for Windows.
  • Close sqlite connections so test tearDown methods can remove temporary directories

Tests written?

No

Commits signed with GPG?

Yes

@salt-jenkins salt-jenkins requested review from saltstack/team-spm Oct 3, 2018

@dwoz dwoz changed the title Add spm tests for Windows Add spm tests to Windows suite Oct 3, 2018

@gtmanfred

This comment has been minimized.

Copy link
Contributor

commented Oct 3, 2018

nice! did you get spm to work on windows? #43174

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Oct 3, 2018

A couple of these new test additions are failing: https://jenkinsci.saltstack.com/job/pr-kitchen-windows2016-py3/job/PR-49875/1/

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Oct 4, 2018

@dwoz Looks like there is an spm test failing on the windows test. Can you take another look?

dwoz added some commits Oct 2, 2018

@dwoz dwoz force-pushed the dwoz:win_spm_tests branch from 2a6717e to e76a751 Oct 4, 2018

if conn is None:
close = True

This comment has been minimized.

Copy link
@isbm

isbm Oct 5, 2018

Contributor

You actually can just None the conn on .close() instead of having close = False | True:

if conn is not None:
    conn.close()
    conn = None

This comment has been minimized.

Copy link
@dwoz

dwoz Oct 5, 2018

Author Contributor

Not really, We do not want to close a connection passed in via the conn keyword argument.

@dwoz dwoz merged commit eee82d3 into saltstack:2018.3 Oct 5, 2018

7 of 10 checks passed

jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
continuous-integration/jenkins/pr-merge This commit is being built
Details
jenkins/pr/py2-windows-2016 running py2-windows-2016...
Details
WIP ready for review
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/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
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.