From 7c7f46a33d30a68b4e070fc5d1515f8a668f3b04 Mon Sep 17 00:00:00 2001
From: Christian Schwede <cschwede@redhat.com>
Date: Thu, 23 Jul 2015 16:32:50 +0000
Subject: Update mock to get away from env markers

Closes-Bug: 1476585

Bug has been reproduced on a fresh installed SAIO using
https://github.com/swiftstack/vagrant-swift-all-in-one.

Change-Id: I0300319baf7e2d8c27d1c19957894396505caeb8
---
 test-requirements.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'test-requirements.txt')

diff --git a/test-requirements.txt b/test-requirements.txt
index 909cb04..7f7e405 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,7 @@ hacking>=0.10.0,<0.11
 
 coverage>=3.6
 discover
-mock>=1.0;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
 oslosphinx
 python-keystoneclient>=0.7.0
 sphinx>=1.1.2,<1.2
-- 
cgit v1.2.1