Skip to content

[Hot Fix] Fix flaky ZeppelinIT build #958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
prabhjyotsingh wants to merge 1 commit into from
Closed

[Hot Fix] Fix flaky ZeppelinIT build #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions zeppelin-server/src/test/java/org/apache/zeppelin/integration/ZeppelinIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ public void testSparkInterpreterDependencyLoading() throws Exception {
interpreterLink.click();
driver.findElement(By.xpath("//div[@id='spark']//button[contains(.,'edit')]")).sendKeys(Keys.ENTER);
WebElement testDepRemoveBtn = pollingWait(By.xpath("//tr[descendant::text()[contains(.,'" +
artifact + "')]]/td[3]/div"), MAX_IMPLICIT_WAIT);
testDepRemoveBtn.click();
artifact + "')]]/td[3]/button"), MAX_IMPLICIT_WAIT);
testDepRemoveBtn.sendKeys(Keys.ENTER);
driver.findElement(By.xpath("//div[@id='spark']//form//button[1]")).click();
driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'Do you want to update this interpreter and restart with new settings?')]" +
"//div[@class='modal-footer']//button[contains(.,'OK')]")).click();
Expand Down
16 changes: 8 additions & 8 deletions zeppelin-web/src/app/interpreter/interpreter-create/interpreter-create.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ <h4>Create new interpreter</h4>
<td><textarea msd-elastic ng-model="value.value"></textarea></td>
<td>{{value.description}}</td>
<td>
<div class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
</div>
<button class="btn btn-default btn-sm fa fa-remove" ng-click="removeInterpreterProperty(key)">
</button>
</td>
</tr>

Expand All @@ -96,8 +96,8 @@ <h4>Create new interpreter</h4>
<td><textarea msd-elastic ng-model="newInterpreterSetting.propertyValue"></textarea></td>
<td></td>
<td>
<div class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterProperty()">
</div>
<button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterProperty()">
</button>
</td>
</tr>
</table>
Expand All @@ -121,9 +121,9 @@ <h4>Create new interpreter</h4>
</textarea>
</td>
<td>
<div class="btn btn-default btn-sm fa fa-remove"
<button class="btn btn-default btn-sm fa fa-remove"
ng-click="removeInterpreterDependency(dep.groupArtifactVersion)">
</div>
</button>
</td>
</tr>

Expand All @@ -140,8 +140,8 @@ <h4>Create new interpreter</h4>
</textarea>
</td>
<td>
<div class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterDependency()">
</div>
<button class="btn btn-default btn-sm fa fa-plus" ng-click="addNewInterpreterDependency()">
</button>
</td>
</tr>
</table>
Expand Down
16 changes: 8 additions & 8 deletions zeppelin-web/src/app/interpreter/interpreter.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ <h5>Properties</h5>
</span>
</td>
<td ng-if="valueform.$visible">
<div class="btn btn-default btn-sm fa fa-remove"
<button class="btn btn-default btn-sm fa fa-remove"
ng-click="removeInterpreterProperty(key, setting.id)">
</div>
</button>
</td>
</tr>
<tr ng-if="valueform.$visible">
Expand All @@ -190,9 +190,9 @@ <h5>Properties</h5>
<textarea msd-elastic ng-model="setting.propertyValue"></textarea>
</td>
<td>
<div class="btn btn-default btn-sm fa fa-plus"
<button class="btn btn-default btn-sm fa fa-plus"
ng-click="addNewInterpreterProperty(setting.id)">
</div>
</button>
</td>
</tr>
</table>
Expand Down Expand Up @@ -227,9 +227,9 @@ <h5>Dependencies</h5>
<div ng-if="!valueform.$visible">{{dep.exclusions.join()}}</div>
</td>
<td ng-if="valueform.$visible">
<div class="btn btn-default btn-sm fa fa-remove"
<button class="btn btn-default btn-sm fa fa-remove"
ng-click="removeInterpreterDependency(dep.groupArtifactVersion, setting.id)">
</div>
</button>
</td>
</tr>
<tr ng-if="valueform.$visible">
Expand All @@ -246,9 +246,9 @@ <h5>Dependencies</h5>
</textarea>
</td>
<td>
<div class="btn btn-default btn-sm fa fa-plus"
<button class="btn btn-default btn-sm fa fa-plus"
ng-click="addNewInterpreterDependency(setting.id)">
</div>
</button>
</td>
</tr>
</table>
Expand Down