From bb6dec2466e8c03ae83fe57d81ffa4d15fa7d97a Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Fri, 10 Jul 2015 13:18:50 +0000
Subject: Fix mocking for 1.1.0

Call the right assertion method on the mock in
test_disablefile_unconfigured, and fix the way the mock is set up so
it works.

Combine this with the change to pin the version of mock used on python
2.6 and to raise the minimum version of mock used elsewhere.

Change-Id: I1ac9f9796227a860df75d4c72464479dbe66258c
---
 test-requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test-requirements.txt')

diff --git a/test-requirements.txt b/test-requirements.txt
index f7dec7d..aacc73a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,8 @@
 
 fixtures>=1.3.1
 hacking<0.11,>=0.10.0
-mock>=1.0
+mock>=1.1;python_version!='2.6'
+mock==1.0.1;python_version=='2.6'
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.5.1 # Apache-2.0
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-- 
cgit v1.2.1