Merge "Switch to os-testr to control testr"

diff --cc test-requirements.txt
index 5648e677f75849cd0227d7bad67fd7ba12f58b9a,6a6436aa3fd0eee63ef4931b1edefeca078fa6ea..ebc0e71f4768fb8262c63ff349bc1fcaf976420e
--- 1/test-requirements.txt
--- 2/test-requirements.txt
+++ b/test-requirements.txt
@@@ -16,5 -16,5 +16,6 @@@ testtools>=0.9.36,!=1.2.
  testscenarios>=0.4
  WebTest>=2.0
  oslotest>=1.5.1  # Apache-2.0
+ os-testr>=0.1.0
  tempest-lib>=0.5.0
 +ddt>=0.7.0

diff --cc tox.ini
Simple merge