From ea52a016b4e9f74c3ce9dd2d5c6e0f778fe53ff9 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@mhtx.net>
Date: Wed, 28 Dec 2011 10:17:52 -0600
Subject: [PATCH] Fixes keystone auth test failures in python 2.6.

Fixes bug 909408.

(cherry picked from commit 00ac2c725097567ab090079db799e70a6f549794)

Change-Id: I18f5bf43f390c8a69f49e5f038acb9dcd80ca502
---
 Authors                        | 1 +
 glance/tests/unit/test_auth.py | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Authors b/Authors
index 2e8e0b7b4e..afae32b1e9 100644
--- a/Authors
+++ b/Authors
@@ -19,6 +19,7 @@ Josh Kearney <josh@jk0.org>
 Justin Shepherd <jshepher@rackspace.com>
 Ken Pepple <ken.pepple@gmail.com>
 Kevin L. Mitchell <kevin.mitchell@rackspace.com>
+Major Hayden <major@mhtx.net>
 Mark McLoughlin <markmc@redhat.com>
 Matt Dietz <matt.dietz@rackspace.com>
 Mike Lundy <mike@pistoncloud.com>
diff --git a/glance/tests/unit/test_auth.py b/glance/tests/unit/test_auth.py
index c4a5112b99..d8ea7160b2 100644
--- a/glance/tests/unit/test_auth.py
+++ b/glance/tests/unit/test_auth.py
@@ -166,7 +166,7 @@ def fake_do_request(cls, url, method, headers=None, body=None):
 
         for creds in good_creds:
             plugin = auth.KeystoneStrategy(creds)
-            self.assertIsNone(plugin.authenticate())
+            self.assertTrue(plugin.authenticate() is None)
 
     def test_v2_auth(self):
         """Test v2 auth code paths"""
@@ -267,4 +267,4 @@ def fake_do_request(cls, url, method, headers=None, body=None):
 
         for creds in good_creds:
             plugin = auth.KeystoneStrategy(creds)
-            self.assertIsNone(plugin.authenticate())
+            self.assertTrue(plugin.authenticate() is None)