Merge "Updated from global requirements"

test-requirements.txt

@@ -7,8 +7,7 @@ hacking<0.10,>=0.9.2
 coverage>=3.6
 discover
 fixtures>=1.3.1
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 oslotest>=1.7.0 # Apache-2.0
 oslosphinx>=2.5.0 # Apache-2.0
 python-subunit>=0.0.18