Merge pull request #10815 from ceph/wip-qa-workunits-py3

Python 3 compatibility for workunits

Reviewed-by: Kefu Chai <kchai@redhat.com>

diff --cc qa/workunits/ceph-disk/ceph-disk.sh
index 4bac24f112cc05ad761ae47b0ae79a929c363c2e,1566d6048828a0b89bbdcbba563cea93af419003..7a795b925d68cb8e70f0fd1f7f3c7a68b847c8a1
--- 1/qa/workunits/ceph-disk/ceph-disk.sh
--- 2/qa/workunits/ceph-disk/ceph-disk.sh
+++ b/qa/workunits/ceph-disk/ceph-disk.sh
@@@ -32,12 -32,11 +35,12 @@@ if ! ${PYTHON} -m pytest --version > /d
      exit 1
  fi
  
- sudo env PATH=$(dirname $0):$(dirname $0)/..:$PATH py.test -s -v $(dirname $0)/ceph-disk-test.py
+ sudo env PATH=$(dirname $0):$(dirname $0)/..:$PATH ${PYTHON} -m pytest -s -v $(dirname $0)/ceph-disk-test.py
  result=$?
  
 +sudo rm -f /lib/udev/rules.d/60-ceph-by-partuuid.rules
  # own whatever was created as a side effect of the py.test run
- # so that it can successfully be removed later on by a non privileged 
+ # so that it can successfully be removed later on by a non privileged
  # process
  sudo chown -R $(id -u) $(dirname $0)
  exit $result