← Back to branch summary

~corey.bryant/keystone/2015.1-b2-0ubuntu1

« back to all changes in this revision

Viewing changes to debian/patches/fix-ubuntu-tests.patch

  • Committer: Corey Bryant
  • Date: 2015-02-11 14:19:22 UTC
  • Revision ID: corey.bryant@canonical.com-20150211141922-jok18qvm5k6nbt1n
* New upstream release.
  - d/control: Align with upstream dependencies.
  - d/p/fix-ubuntu-tests.patch: Dropped. Patched code has been removed.
  - d/p/sql_connection.patch: Rebased.
  - d/p/default-log-dir.patch: Rebased.
  - d/p/add-version-info.patch: Rebased.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-ubuntu-tests.patch
1
 
From 87a0fab930757953c016a883834b24dc11743904 Mon Sep 17 00:00:00 2001
2
 
From: Chuck Short <chuck.short@canonical.com>
3
 
Date: Fri, 20 Jun 2014 09:11:57 -0400
4
 
Subject: [PATCH] patch
5
 
 
6
 
Signed-off-by: Chuck Short <chuck.short@canonical.com>
7
 
---
8
 
 keystone/tests/test_keystoneclient.py | 12 ++++++------
9
 
 1 file changed, 6 insertions(+), 6 deletions(-)
10
 
 
11
 
--- a/keystone/tests/test_keystoneclient.py
12
 
+++ b/keystone/tests/test_keystoneclient.py
13
 
@@ -65,12 +65,12 @@ class CompatTestCase(tests.NoModule, tes
14
 
 
15
 
         self.addCleanup(self.cleanup_instance('public_server', 'admin_server'))
16
 
 
17
 
-        if isinstance(self.checkout_info, str):
18
 
-            revdir = self.checkout_info
19
 
-        else:
20
 
-            revdir = tests.checkout_vendor(*self.checkout_info)
21
 
-        self.add_path(revdir)
22
 
-        self.clear_module('keystoneclient')
23
 
+        #if isinstance(self.checkout_info, str):
24
 
+        #    revdir = self.checkout_info
25
 
+        #else:
26
 
+        #    revdir = tests.checkout_vendor(*self.checkout_info)
27
 
+        #self.add_path(revdir)
28
 
+        #self.clear_module('keystoneclient')
29
 
 
30
 
     def _public_url(self):
31
 
         public_port = self.public_server.socket_info['socket'][1]