Browse Source

[beeswax] Fix for Beeswax after Hive Server 2 support

Romain Rigaux 12 years ago
parent
commit
1568565da9
2 changed files with 2 additions and 2 deletions
  1. 1 1
      apps/beeswax/src/beeswax/server/dbms.py
  2. 1 1
      apps/beeswax/src/beeswax/tests.py

+ 1 - 1
apps/beeswax/src/beeswax/server/dbms.py

@@ -341,7 +341,7 @@ def expand_exception(exc, db, handle=None):
   try:
   try:
     if handle is not None:
     if handle is not None:
       log = db.get_log(handle)
       log = db.get_log(handle)
-    elif hasattr(handle, 'get_rpc_handle'):
+    elif hasattr(exc, 'get_rpc_handle') or hasattr(exc, 'log_context'):
       log = db.get_log(exc)
       log = db.get_log(exc)
     else:
     else:
       log = _("No server logs for this query")
       log = _("No server logs for this query")

+ 1 - 1
apps/beeswax/src/beeswax/tests.py

@@ -1320,7 +1320,7 @@ def test_history_page():
   assert_equal({}, response.context['filter_params'])
   assert_equal({}, response.context['filter_params'])
 
 
   # Test pagination
   # Test pagination
-  response = do_view('?q-page=100')
+  response = do_view('q-page=100')
   assert_equal(0, len(response.context['page'].object_list))
   assert_equal(0, len(response.context['page'].object_list))
 
 
 def test_strip_trailing_semicolon():
 def test_strip_trailing_semicolon():