summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2022-07-26 15:07:35 -0700
committerTim Burke <tim.burke@gmail.com>2022-12-09 11:38:02 -0800
commitef155bd74aaf4ffce11956b2e5bd921dfb5d8809 (patch)
tree62ff11db3b04201a831e20a94f31ac0ce578c8b4 /tools
parent745dfec35e50fb4e3fe5d16da431215bf88a835c (diff)
downloadswift-ef155bd74aaf4ffce11956b2e5bd921dfb5d8809.tar.gz
Switch to pytest
nose has not seen active development for many years now. With py310, we can no longer use it due to import errors. Also update lower contraints Closes-Bug: #1993531 Change-Id: I215ba0d4654c9c637c3b97953d8659ac80892db8
Diffstat (limited to 'tools')
-rw-r--r--tools/playbooks/common/install_dependencies.yaml11
-rw-r--r--tools/playbooks/probetests/run.yaml2
2 files changed, 8 insertions, 5 deletions
diff --git a/tools/playbooks/common/install_dependencies.yaml b/tools/playbooks/common/install_dependencies.yaml
index 6e2693a27..40eecd037 100644
--- a/tools/playbooks/common/install_dependencies.yaml
+++ b/tools/playbooks/common/install_dependencies.yaml
@@ -35,14 +35,17 @@
- name: install python modules with pip
pip: name={{ item }} state=present extra_args='--upgrade'
with_items:
+ # For some reason, pip on py2 isn't smart enough to prevent us
+ # trying to install a too-new mock or attrs??
+ - 'mock<4'
+ - 'attrs<22.1.0'
+ # Order matters; install constrained versions *first*, then unconstrained
- crudini
- eventlet
- - nose
- pyeclib
+ - pytest
+ - pytest-cov
- python-swiftclient
- # For some reason, pip on py2 isn't smart enough to prevent us
- # trying to install a too-new mock??
- - 'mock<4'
- name: install PasteDeploy - CentOS 7
pip: name={{ item }} state=present extra_args='--upgrade'
diff --git a/tools/playbooks/probetests/run.yaml b/tools/playbooks/probetests/run.yaml
index 323b52cb7..e6ea0a21f 100644
--- a/tools/playbooks/probetests/run.yaml
+++ b/tools/playbooks/probetests/run.yaml
@@ -21,6 +21,6 @@
shell:
cmd: |
source ~/.bashrc
- nosetests test/probe/ --with-id || nosetests --failed
+ pytest test/probe/ || pytest --last-failed test/probe/
executable: /bin/bash
chdir: '{{ zuul.project.src_dir }}'