Переглянути джерело

[core] REST Exception also gets the headers of urllib2.HTTPError

Enable to retrieve the Oozie API errors messages (only stored in the headers).
Add a test.
Romain Rigaux 13 роки тому
батько
коміт
220f252968

+ 4 - 1
desktop/core/src/desktop/lib/rest/http_client.py

@@ -36,10 +36,13 @@ class RestException(Exception):
     self._error = error
     self._code = None
     self._message = str(error)
-    # See if there is a code or a message. (For urllib2.HTTPError.)
+    self._headers = None
+
+    # Get more information if urllib2.HTTPError.
     try:
       self._code = error.code
       self._message = error.read()
+      self._headers = error.info()
     except AttributeError:
       pass
 

+ 40 - 0
desktop/core/src/desktop/lib/rest/http_client_test.py

@@ -0,0 +1,40 @@
+# Licensed to Cloudera, Inc. under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  Cloudera, Inc. licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from urllib2 import HTTPError, URLError
+
+from nose.tools import assert_equal
+
+from desktop.lib.rest.http_client import RestException
+
+
+class MockFile:
+  def read(self):
+    return 'my data'
+  def readline(self):
+    return 'my data'
+
+
+def test_url_error_rest_exception():
+  exception = RestException(URLError('My error'))
+  assert_equal(None, exception._headers)
+
+
+def test_http_error_rest_exception():
+  headers = {'my header': 'one value'}
+
+  exception = RestException(HTTPError('url', 404, 'My error', headers, MockFile()))
+  assert_equal(headers, exception._headers)