Procházet zdrojové kódy

HUE-7156 [core] Fix failing live cluster test desktop.tests:test_dump_config

Failing with error CalledProcessError: Command '/var/lib/jenkins/workspace/Hue-Systest-master-unsecure/hue/test-conf/HUE_SERVER/altscript.sh sec-9-navmetadataserver_cmdb_password' returned non-zero exit status 126
krish před 8 roky
rodič
revize
4b403df

+ 12 - 1
desktop/core/src/desktop/templates/dump_config.mako

@@ -15,9 +15,13 @@
 ## limitations under the License.
 ## limitations under the License.
 
 
 <%!
 <%!
+import logging
+
 from desktop.lib.conf import BoundContainer, is_anonymous
 from desktop.lib.conf import BoundContainer, is_anonymous
 from desktop.views import commonheader, commonfooter
 from desktop.views import commonheader, commonfooter
 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext as _
+
+LOG = logging.getLogger(__name__)
 %>
 %>
 
 
 <%namespace name="layout" file="about_layout.mako" />
 <%namespace name="layout" file="about_layout.mako" />
@@ -137,7 +141,14 @@ ${ layout.menubar(section='dump_config') }
             % else:
             % else:
               ${ str(config_obj.get_raw()).decode('utf-8', 'replace') }
               ${ str(config_obj.get_raw()).decode('utf-8', 'replace') }
             % endif
             % endif
-              %if str(config_obj.get_raw()).decode('utf-8', 'replace') == '':
+              <%
+                config_str = None
+                try:
+                  config_str = str(config_obj.get_raw()).decode('utf-8', 'replace')
+                except:
+                  LOG.exception("Potential misconfiguration. Error value of key '%s' in configuration." % config_obj.grab_key)
+              %>
+              %if config_str == '':
               &nbsp;
               &nbsp;
               %endif
               %endif
             </code><br/>
             </code><br/>

+ 1 - 1
desktop/libs/notebook/src/notebook/connectors/tests/tests_hiveserver2.py

@@ -481,7 +481,7 @@ class TestHiveserver2ApiWithHadoop(BeeswaxSampleProvider):
     self.user = User.objects.get(username='test')
     self.user = User.objects.get(username='test')
     add_to_group('test')
     add_to_group('test')
     grant_access("test", "test", "notebook")
     grant_access("test", "test", "notebook")
-    grant_access("test", "default", "impala")
+    grant_access("test", "test", "impala")
 
 
     self.db = dbms.get(self.user, get_query_server_config())
     self.db = dbms.get(self.user, get_query_server_config())
     self.cluster.fs.do_as_user('test', self.cluster.fs.create_home_dir, '/user/test')
     self.cluster.fs.do_as_user('test', self.cluster.fs.create_home_dir, '/user/test')