From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 19 Sep 2016 10:45:34 +0000 (+0800)
Subject: Merge pull request #10815 from ceph/wip-qa-workunits-py3
X-Git-Tag: v11.0.1~182
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=440c360d18305fa954ef0c004caae2b58d523473;p=ceph.git

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

Python 3 compatibility for workunits

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

440c360d18305fa954ef0c004caae2b58d523473
diff --cc qa/workunits/ceph-disk/ceph-disk.sh
index 4bac24f112c,1566d604882..7a795b925d6
--- a/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