Merge "Updated from global requirements"

Author: Jenkins

test-requirements.txt

@@ -6,7 +6,7 @@ hacking<0.11,>=0.10.0
 coverage>=3.6 # Apache-2.0
 discover # BSD
 fixtures>=1.3.1 # Apache-2.0/BSD
-mock>=1.2;python_version<'3.3' # BSD
+mock>=1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 reno>=0.1.1 # Apache2