← Back to branch summary

~corey.bryant/python-keystoneclient/icehouse-http_connect_timeout

« back to all changes in this revision

Viewing changes to debian/patches/use-mox-dependency.patch

  • Committer: Chuck Short
  • Date: 2013-11-14 15:51:35 UTC
  • Revision ID: zulcss@ubuntu.com-20131114155135-vpr9msfh3pxigew0
Tags: 1:0.4.1-0ubuntu1
releasing package python-keystoneclient version 1:0.4.1-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/use-mox-dependency.patch
1
 
From 211ecfc861443e1a59f2b229105ba0adbd57167a Mon Sep 17 00:00:00 2001
2
 
From: Chuck Short <chuck.short@canonical.com>
3
 
Date: Mon, 16 Sep 2013 15:40:46 -0400
4
 
Subject: [PATCH] fox
5
 
 
6
 
Signed-off-by: Chuck Short <chuck.short@canonical.com>
7
 
---
8
 
 test-requirements.txt    | 2 +-
9
 
 tests/utils.py           | 5 ++++-
10
 
 tests/v2_0/test_shell.py | 6 +++++-
11
 
 tests/v3/utils.py        | 6 +++++-
12
 
 4 files changed, 15 insertions(+), 4 deletions(-)
13
 
 
14
 
diff --git a/test-requirements.txt b/test-requirements.txt
15
 
index 9219bc7..24d9267 100644
16
 
--- a/test-requirements.txt
17
 
+++ b/test-requirements.txt
18
 
@@ -5,7 +5,7 @@ fixtures>=0.3.12
19
 
 httpretty>=0.6.3
20
 
 keyring>=1.6.1
21
 
 mock>=0.8.0
22
 
-mox3>=0.7.0
23
 
+mox
24
 
 pycrypto>=2.6
25
 
 sphinx>=1.1.2
26
 
 testrepository>=0.0.17
27
 
diff --git a/tests/utils.py b/tests/utils.py
28
 
index 87ddeba..51c7397 100644
29
 
--- a/tests/utils.py
30
 
+++ b/tests/utils.py
31
 
@@ -15,7 +15,10 @@
32
 
 import time
 
1
diff -Naurp python-keystoneclient-0.4.1.orig/keystoneclient/tests/utils.py python-keystoneclient-0.4.1/keystoneclient/tests/utils.py
 
2
--- python-keystoneclient-0.4.1.orig/keystoneclient/tests/utils.py      2013-10-16 16:33:40.000000000 -0400
 
3
+++ python-keystoneclient-0.4.1/keystoneclient/tests/utils.py   2013-11-14 10:39:01.943400104 -0500
 
4
@@ -17,7 +17,10 @@ import time
33
5
 
 
6
 import httpretty
34
7
 import mock
35
8
-from mox3 import mox
36
9
+try:
40
13
 import requests
41
14
 import testtools
42
15
 
43
 
diff --git a/tests/v2_0/test_shell.py b/tests/v2_0/test_shell.py
44
 
index 6ad29a8..31be89f 100644
45
 
--- a/tests/v2_0/test_shell.py
46
 
+++ b/tests/v2_0/test_shell.py
47
 
@@ -16,7 +16,11 @@ import cStringIO
 
16
diff -Naurp python-keystoneclient-0.4.1.orig/keystoneclient/tests/v2_0/test_shell.py python-keystoneclient-0.4.1/keystoneclient/tests/v2_0/test_shell.py
 
17
--- python-keystoneclient-0.4.1.orig/keystoneclient/tests/v2_0/test_shell.py    2013-10-16 16:33:40.000000000 -0400
 
18
+++ python-keystoneclient-0.4.1/keystoneclient/tests/v2_0/test_shell.py 2013-11-14 10:39:30.551400786 -0500
 
19
@@ -16,7 +16,10 @@ import cStringIO
48
20
 import os
49
21
 import sys
50
22
 
53
25
+    from mox3 import stubout
54
26
+except ImportError:
55
27
+    from mox import stubout
56
 
+
57
28
 from testtools import matchers
58
29
 
59
30
 from keystoneclient import httpclient
60
 
diff --git a/tests/v3/utils.py b/tests/v3/utils.py
61
 
index 8358f82..c283c8d 100644
62
 
--- a/tests/v3/utils.py
63
 
+++ b/tests/v3/utils.py
64
 
@@ -19,7 +19,11 @@ import urlparse
65
 
 import uuid
66
 
 
67
 
 import mock
68
 
-from mox3 import mox
69
 
+try:
70
 
+    from mox3 import mox
71
 
+except ImportError:
72
 
+    import mox
73
 
+
74
 
 import requests
75
 
 import testtools
76
 
 
77
 
1.8.3.2
78