← Back to branch summary

~zulcss/python-keystoneclient/mox

« back to all changes in this revision

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

  • Committer: Chuck Short
  • Date: 2013-09-16 19:49:15 UTC
  • Revision ID: zulcss@ubuntu.com-20130916194915-8aoundurhm3wjov2
debian/patches/use-mox-dependency.patch: Use mox instead of mox3
dependency.

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
 
33
 
 
34
 import mock
 
35
-from mox3 import mox
 
36
+try:
 
37
+    from mox3 import mox
 
38
+except ImportError:
 
39
+    import mox
 
40
 import requests
 
41
 import testtools
 
42
 
 
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
 
48
 import os
 
49
 import sys
 
50
 
 
51
-from mox3 import stubout
 
52
+try:
 
53
+    from mox3 import stubout
 
54
+except ImportError:
 
55
+    from mox import stubout
 
56
+
 
57
 from testtools import matchers
 
58
 
 
59
 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
-- 
 
78
1.8.3.2
 
79