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

Revert "Make sure --run-expensive runtests.py arg works" #52986

Merged
merged 1 commit into from May 13, 2019

Conversation

@Ch3LL
Copy link
Contributor

commented May 13, 2019

This reverts commit 56bf069.

This change was causing all cloud tests to get skipped, because expensive tests where not enabled.

This reverts commit 56bf069.
@s0undt3ch

This comment has been minimized.

Copy link
Member

commented May 13, 2019

But if we pass --run-expensive on the CLI, they get tested?

@Ch3LL

This comment has been minimized.

Copy link
Contributor Author

commented May 13, 2019

yes that would work, so the question is do we want to require passing --run-expensive alongside cloud-tests which was not the previous behavior?

@s0undt3ch

This comment has been minimized.

Copy link
Member

commented May 13, 2019

Are the cloud tests the only expensive tests?

@Ch3LL

This comment has been minimized.

Copy link
Contributor Author

commented May 13, 2019

(salt-py3) ➜  salt git:(ee05da5951) grep -ri @expens tests 
tests/support/helpers.py:            @expensiveTest
Binary file tests/support/__pycache__/helpers.cpython-37.pyc matches
tests/integration/externalapi/test_venafiapi.py:@expensiveTest
tests/integration/cloud/clouds/test_gogrid.py:    @expensiveTest
tests/integration/cloud/clouds/test_vultrpy.py:    @expensiveTest
tests/integration/cloud/clouds/test_digitalocean.py:    @expensiveTest
tests/integration/cloud/clouds/test_linode.py:    @expensiveTest
tests/integration/cloud/clouds/test_msazure.py:    @expensiveTest
tests/integration/cloud/clouds/test_vmware.py:    @expensiveTest
tests/integration/cloud/clouds/test_dimensiondata.py:    @expensiveTest
tests/integration/cloud/clouds/test_gce.py:    @expensiveTest
tests/integration/cloud/clouds/test_joyent.py:    @expensiveTest
tests/integration/cloud/clouds/test_openstack.py:    @expensiveTest
tests/integration/cloud/clouds/test_profitbricks.py:    @expensiveTest
tests/integration/cloud/clouds/test_ec2.py:    @expensiveTest
tests/integration/cloud/clouds/test_oneandone.py:    @expensiveTest
tests/integration/cloud/test_cloud.py:    @expensiveTest
tests/integration/runners/test_state.py:    @expensiveTest
tests/integration/runners/test_state.py:    @expensiveTest
tests/integration/runners/test_state.py:    @expensiveTest

a couple of runner tests too

@s0undt3ch

This comment has been minimized.

Copy link
Member

commented May 13, 2019

Yeah, lets revert this but re-add the commit on develop?
So that it's explicit?

@s0undt3ch s0undt3ch merged commit 055d374 into saltstack:2019.2.1 May 13, 2019
17 checks passed
17 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 Python lint test has passed
Details
jenkins/pr/py2-centos-6 The py2-centos-6 job has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-debian-8 The py2-debian-8 job has passed
Details
jenkins/pr/py2-debian-9 The py2-debian-9 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-ubuntu-1804 The py2-ubuntu-1804 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-debian-8 The py3-debian-8 job has passed
Details
jenkins/pr/py3-debian-9 The py3-debian-9 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-ubuntu-1804 The py3-ubuntu-1804 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
@Ch3LL

This comment has been minimized.

Copy link
Contributor Author

commented May 13, 2019

I think the best thing would be to figure out why we cannot have both set, because the code is suppose to set the os.environment to EXPENSIVE_TESTS=True if cloud-tests are being run. I just wanted to revert this quickly so we could start getting some test results. I also was not sure if it was worth it to delve into this since we will be migrating to pytest soon.

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