> On June 30, 2016, 10:52 a.m., Andrii Tkach wrote: > > ambari-web/test/controllers/wizard/step8_test.js, line 898 > > <https://reviews.apache.org/r/49385/diff/1/?file=1433134#file1433134line898> > > > > Remove unnecessary logs
I have removed this in the new patch. > On June 30, 2016, 10:52 a.m., Andrii Tkach wrote: > > ambari-web/test/controllers/wizard/step8_test.js, line 924 > > <https://reviews.apache.org/r/49385/diff/1/?file=1433134#file1433134line924> > > > > stub and restore should be placed in beforeEach and afterEach > > correspondingly. Use this.mock = sinon.stub(...) and then this.mock.returns > > in it(...) Thanks. I have made the changes that you suggested. - Sangeeta ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/49385/#review140134 ----------------------------------------------------------- On June 30, 2016, 8:57 p.m., Sangeeta Ravindran wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/49385/ > ----------------------------------------------------------- > > (Updated June 30, 2016, 8:57 p.m.) > > > Review request for Ambari, Alexandr Antonenko and Andrii Tkach. > > > Bugs: AMBARI-17469 > https://issues.apache.org/jira/browse/AMBARI-17469 > > > Repository: ambari > > > Description > ------- > > During Hive install, in the review page, the default value of > hive_admin_database (MySQL) is concatenated to the selected database type, no > matter which database is selected. For e.g. if Existing PostgreSQL Database > is selected as the Hive database, the review page displays the following for > Hive database: > > Database : MySQL (Existing PostgreSQL Database) > > In case of Oozie, because there is no oozie_admin_database property, a blank > is displayed for database although an existing database was selected > > Database : > > This seems to be because of the logic in the method that determines the > database value to be displayed. > > var dbFull = serviceConfigProperties.findProperty('name', > serviceName.toLowerCase() + '_database'), > db = serviceConfigProperties.findProperty('name', > serviceName.toLowerCase() + '_ambari_database'); > return db && dbFull ? db.value + ' (' + dbFull.value + ')' : ''; > > The value of hive_ambari_database returns MySQL and hence in case of Hive, > MySQL always gets appended. > > There is no oozie_ambari_database property defined. Hence db is undefined and > an emtpy string is returned instead of the actual database type selected. > > Fix involves changing the logic to not include the value of > serviceName_ambari_database since it will not have the right value unless the > default value is selected for Hive/Oozie database. > > > Diffs > ----- > > ambari-web/app/controllers/wizard/step8_controller.js 3971cf5 > ambari-web/test/controllers/wizard/step8_test.js 74e042b > > Diff: https://reviews.apache.org/r/49385/diff/ > > > Testing > ------- > > Manual testing. > Added a test case to verify the value displayed for database. > Ran mvn test > > 28979 tests complete (48 seconds) > 154 tests pending > > > File Attachments > ---------------- > > Updated Patch with review comments incorporated > > https://reviews.apache.org/media/uploaded/files/2016/06/30/e5fa58fa-3940-4c82-ad92-c8070c824528__AMBARI-17469.patch > > > Thanks, > > Sangeeta Ravindran > >
