Merge "Prevent AttributeError if no authorization"

keystoneclient/httpclient.py

@@ -312,7 +312,7 @@ class HTTPClient(baseclient.Client, base.BaseAuthPlugin):
 
     def has_service_catalog(self):
         """Returns True if this client provides a service catalog."""
-        return self.auth_ref.has_service_catalog()
+        return self.auth_ref and self.auth_ref.has_service_catalog()
 
     @property
     def tenant_id(self):

keystoneclient/tests/v3/test_client.py

@@ -33,6 +33,7 @@ class KeystoneClientTest(utils.TestCase):
         self.assertFalse(c.auth_ref.project_scoped)
         self.assertEqual(c.auth_user_id,
                          'c4da488862bd435c9e6c0275a0d0e49a')
+        self.assertFalse(c.has_service_catalog())
 
     def test_domain_scoped_init(self):
         self.stub_auth(json=client_fixtures.domain_scoped_token())