Merge "Sync up with global requirements"

diff --cc test-requirements.txt
index 6ebe350b2002cf53bb79705bbec80642626509af,ffcf7bd3072695167a2f61d36aeadc4188f627be..7a7ff9c7ad427a8266e6b1c84525e4f86e0cafb3
--- 1/test-requirements.txt
--- 2/test-requirements.txt
+++ b/test-requirements.txt
@@@ -14,6 -11,5 +11,6 @@@ psycopg
  sphinx>=1.1.2
  python-subunit
  testtools>=0.9.32
- testrepository>=0.0.15
+ testrepository>=0.0.17
  oslo.sphinx
 +python-novaclient>=2.12.0