Merged
Conversation
mgfritch
reviewed
Jan 13, 2021
d9eb96c to
8ee2aea
Compare
Contributor
|
run-tox-mgr failed |
8ee2aea to
5703b9d
Compare
Author
|
make check will still fail because of changes needed from #38854 but tox passed locally with the commit from that pr cherry-picked |
92533ac to
625f380
Compare
sebastian-philipp
suggested changes
Feb 1, 2021
Contributor
sebastian-philipp
left a comment
There was a problem hiding this comment.
This PR makes test/test_upgrade.py take 120.4 seconds instead of 0.4 seconds:
LANG=C ../../script/run_tox.sh --tox-envs=mypy,py3 mgr -- cephadm/tests/test_upgrade.py
Requirement already satisfied: tox in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (3.14.3)
Requirement already satisfied: virtualenv>=16.0.0 in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from tox) (16.7.9)
Requirement already satisfied: filelock<4,>=3.0.0 in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from tox) (3.0.12)
Requirement already satisfied: pluggy<1,>=0.12.0 in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from tox) (0.13.1)
Requirement already satisfied: packaging>=14 in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from tox) (20.0)
Requirement already satisfied: toml>=0.9.4 in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from tox) (0.10.0)
Requirement already satisfied: six<2,>=1.0.0 in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from tox) (1.13.0)
Requirement already satisfied: importlib-metadata<2,>=0.12; python_version < "3.8" in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from tox) (1.3.0)
Requirement already satisfied: py<2,>=1.4.17 in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from tox) (1.8.1)
Requirement already satisfied: pyparsing>=2.0.2 in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from packaging>=14->tox) (2.4.6)
Requirement already satisfied: zipp>=0.5 in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from importlib-metadata<2,>=0.12; python_version < "3.8"->tox) (0.6.0)
Requirement already satisfied: more-itertools in /home/sebastian/Repos/ceph/build/mgr/lib/python3.6/site-packages (from zipp>=0.5->importlib-metadata<2,>=0.12; python_version < "3.8"->tox) (8.0.2)
WARNING: You are using pip version 19.3.1; however, version 21.0 is available.
You should consider upgrading via the 'pip install --upgrade pip' command.
mypy installed: DEPRECATION: --find-links option in pip freeze is deprecated. pip 21.2 will remove support for this functionality. You can find discussion regarding this at https://github.com/pypa/pip/issues/9069.,-f /home/sebastian/Repos/ceph/src/pybind/mgr/wheelhouse,apipkg==1.5,attrs==20.3.0,cachetools==4.2.0,-e git+git@github.com:sebastian-philipp/ceph.git@625f380cac993d53d11fbefc078dc25d0b665ff0#egg=ceph&subdirectory=src/python-common,certifi==2020.12.5,cffi==1.14.4,chardet==4.0.0,coverage==5.3.1,cryptography==3.3.1,Cython==0.29.21,execnet==1.7.1,google-auth==1.24.0,idna==2.10,importlib-metadata==3.3.0,iniconfig==1.1.1,Jinja2==2.11.2,kubernetes==12.0.1,MarkupSafe==1.1.1,mypy==0.790,mypy-extensions==0.4.3,oauthlib==3.1.0,packaging==20.8,pluggy==0.13.1,prettytable==2.0.0,py==1.10.0,pyasn1==0.4.8,pyasn1-modules==0.2.8,pycparser==2.20,pyfakefs==4.3.3,pyOpenSSL==20.0.1,pyparsing==2.4.7,pytest==6.2.1,pytest-cov==2.7.1,python-dateutil==2.8.1,PyYAML==5.3.1,remoto==1.2.0,requests==2.25.1,requests-mock==1.8.0,requests-oauthlib==1.3.0,rsa==4.6,six==1.15.0,toml==0.10.2,typed-ast==1.4.2,typing-extensions==3.7.4.3,urllib3==1.26.2,wcwidth==0.2.5,websocket-client==0.57.0,zipp==3.4.0
mypy run-test-pre: PYTHONHASHSEED='2247337815'
mypy run-test: commands[0] | mypy --config-file=../../mypy.ini -m cephadm -m dashboard -m devicehealth -m mds_autoscaler -m mgr_module -m mgr_util -m mirroring -m orchestrator -m progress -m prometheus -m rook -m snap_schedule -m stats -m test_orchestrator -m volumes -m zabbix
Success: no issues found in 16 source files
py3 installed: -f /home/sebastian/Repos/ceph/src/pybind/mgr/wheelhouse,apipkg==1.5,attrs==20.2.0,cachetools==4.1.1,-e git+git@github.com:sebastian-philipp/ceph.git@625f380cac993d53d11fbefc078dc25d0b665ff0#egg=ceph&subdirectory=src/python-common,certifi==2020.6.20,cffi==1.14.2,chardet==3.0.4,coverage==5.2.1,cryptography==3.1,Cython==0.29.21,execnet==1.7.1,google-auth==1.21.1,idna==2.10,importlib-metadata==1.7.0,iniconfig==1.0.1,Jinja2==2.11.2,kubernetes==11.0.0,MarkupSafe==1.1.1,more-itertools==8.5.0,oauthlib==3.1.0,packaging==20.4,pluggy==0.13.1,prettytable==0.7.2,py==1.9.0,pyasn1==0.4.8,pyasn1-modules==0.2.8,pycparser==2.20,pyfakefs==4.1.0,pyOpenSSL==19.1.0,pyparsing==2.4.7,pytest==6.0.1,pytest-cov==2.7.1,python-dateutil==2.8.1,PyYAML==5.3.1,remoto==1.2.0,requests==2.24.0,requests-mock==1.8.0,requests-oauthlib==1.3.0,rsa==4.6,six==1.15.0,toml==0.10.1,urllib3==1.25.10,websocket-client==0.57.0,zipp==3.1.0
py3 run-test-pre: PYTHONHASHSEED='2247337815'
py3 run-test: commands[0] | pytest --doctest-modules cephadm/tests/test_upgrade.py
========================================================================================================================================================= test session starts ==========================================================================================================================================================
platform linux -- Python 3.6.9, pytest-6.0.1, py-1.9.0, pluggy-0.13.1
cachedir: .tox/py3/.pytest_cache
rootdir: /home/sebastian/Repos/ceph/src/pybind/mgr
plugins: requests-mock-1.8.0, pyfakefs-4.1.0, cov-2.7.1
collected 4 items
cephadm/tests/test_upgrade.py .... [100%]
==================================================================================================================================================== 4 passed in 120.44s (0:02:00) =====================================================================================================================================================
_______________________________________________________________________________________________________________________________________________________________ summary ________________________________________________________________________________________________________________________________________________________________
mypy: commands succeeded
py3: commands succeeded
congratulations :)
depends on ceph#38854 Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
625f380 to
96dcb15
Compare
Author
|
test/test_upgrade.py took +120 seconds because of the 4 tries that sleep(15) in _wait_for_ok_to_stop https://github.com/ceph/ceph/blob/master/src/pybind/mgr/cephadm/upgrade.py#L212 |
sebastian-philipp
approved these changes
Feb 4, 2021
Contributor
3 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
implements ok-to-stop for mgr
depends on #38854
Signed-off-by: Daniel-Pivonka dpivonka@redhat.com