Skip to content
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

Jump to bottom

[6.x] fixing flaky vsualize data_table_nontimeindex test (#22288) #22401

Merged
merged 1 commit into from
Aug 27, 2018
Merged

[6.x] fixing flaky vsualize data_table_nontimeindex test (#22288) #22401

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
2 changes: 1 addition & 1 deletion src/ui/public/vis/editors/default/agg_group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<ng-form vis-editor-agg name="aggForm" class="vis-editor-agg"></ng-form>
</div>

<vis-editor-agg-add ng-if="stats.count === 0" class="vis-editor-agg-add"></vis-editor-agg-add>
<vis-editor-agg-add ng-if="stats.count === 0" data-test-subj="addAggregationButton" class="vis-editor-agg-add"></vis-editor-agg-add>
</div>
</div>
4 changes: 2 additions & 2 deletions src/ui/public/vis/editors/default/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@

<div class="vis-editor-config" ng-show="sidebar.section == 'data'">
<!-- metrics -->
<vis-editor-agg-group ng-if="vis.type.schemas.metrics" group-name="metrics"></vis-editor-agg-group>
<vis-editor-agg-group ng-if="vis.type.schemas.metrics" data-test-subj="metricsAggGroup" group-name="metrics"></vis-editor-agg-group>

<!-- buckets -->
<vis-editor-agg-group ng-if="vis.type.schemas.buckets" group-name="buckets"></vis-editor-agg-group>
<vis-editor-agg-group ng-if="vis.type.schemas.buckets" data-test-subj="bucketsAggGroup" group-name="buckets"></vis-editor-agg-group>
</div>

<div class="vis-editor-config" ng-repeat="tab in vis.type.editorConfig.optionTabs" ng-show="sidebar.section == tab.name">
Expand Down
3 changes: 1 addition & 2 deletions test/functional/apps/getting_started/_shakespeare.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ export default function ({ getService, getPageObjects }) {
*/
it('should configure Terms aggregation on play_name', async function () {
await PageObjects.visualize.clickBucket('X-Axis');
await PageObjects.common.sleep(1000);
log.debug('Aggregation = Terms');
await PageObjects.visualize.selectAggregation('Terms');
aggIndex = aggIndex + 1;
Expand Down Expand Up @@ -139,7 +138,7 @@ export default function ({ getService, getPageObjects }) {
*/
it('should configure Max aggregation metric on speech_number', async function () {
await PageObjects.visualize.clickAddMetric();
await PageObjects.visualize.clickBucket('Y-Axis');
await PageObjects.visualize.clickBucket('Y-Axis', 'metric');
log.debug('Aggregation = Max');
await PageObjects.visualize.selectYAxisAggregation('Max', 'speech_number', 'Max Speaking Parts', aggIndex);
await PageObjects.visualize.clickGo();
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/visualize/_data_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.clickNewSearch();
await PageObjects.header.setAbsoluteRange(fromTime, toTime);
await PageObjects.visualize.clickAddMetric();
await PageObjects.visualize.clickBucket('Metric');
await PageObjects.visualize.clickBucket('Metric', 'metric');
await PageObjects.visualize.selectAggregation('Average Bucket', 'metrics');
await PageObjects.visualize.selectAggregation('Terms', 'metrics', 'buckets');
await PageObjects.visualize.selectField('geo.src', 'metrics', 'buckets');
Expand Down
5 changes: 1 addition & 4 deletions test/functional/apps/visualize/_data_table_nontimeindex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export default function ({ getService, getPageObjects }) {
log.debug('clickNewSearch');
await PageObjects.visualize.clickNewSearch(PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED);
log.debug('Bucket = Split Rows');
await PageObjects.common.sleep(500);
await PageObjects.visualize.clickBucket('Split Rows');
log.debug('Aggregation = Histogram');
await PageObjects.visualize.selectAggregation('Histogram');
Expand Down Expand Up @@ -105,7 +104,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.clickDataTable();
await PageObjects.visualize.clickNewSearch(PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED);
await PageObjects.visualize.clickAddMetric();
await PageObjects.visualize.clickBucket('Metric');
await PageObjects.visualize.clickBucket('Metric', 'metric');
await PageObjects.visualize.selectAggregation('Average Bucket', 'metrics');
await PageObjects.visualize.selectAggregation('Terms', 'metrics', 'buckets');
await PageObjects.visualize.selectField('geo.src', 'metrics', 'buckets');
Expand All @@ -119,7 +118,6 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.navigateToNewVisualization();
await PageObjects.visualize.clickDataTable();
await PageObjects.visualize.clickNewSearch(PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED);
await PageObjects.common.sleep(500);
await PageObjects.visualize.clickBucket('Split Rows');
await PageObjects.visualize.selectAggregation('Date Histogram');
await PageObjects.visualize.selectField('@timestamp');
Expand All @@ -139,7 +137,6 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.navigateToNewVisualization();
await PageObjects.visualize.clickDataTable();
await PageObjects.visualize.clickNewSearch(PageObjects.visualize.index.LOGSTASH_NON_TIME_BASED);
await PageObjects.common.sleep(500);
await PageObjects.visualize.clickBucket('Split Rows');
await PageObjects.visualize.selectAggregation('Date Histogram');
await PageObjects.visualize.selectField('@timestamp');
Expand Down
3 changes: 1 addition & 2 deletions test/functional/apps/visualize/_gauge_chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,11 @@ export default function ({ getService, getPageObjects }) {
const expectedTexts = [ '2,904\nwin 8: Count', '0B\nwin 8: Min bytes' ];

await PageObjects.visualize.clickMetricEditor();
await PageObjects.visualize.clickBucket('Split Group');
await PageObjects.visualize.selectAggregation('Terms');
await PageObjects.visualize.selectField('machine.os.raw');
await PageObjects.visualize.setSize('1');
await PageObjects.visualize.clickAddMetric();
await PageObjects.visualize.clickBucket('Metric');
await PageObjects.visualize.clickBucket('Metric', 'metric');
await PageObjects.visualize.selectAggregation('Min', 'metrics');
await PageObjects.visualize.selectField('bytes', 'metrics');
await PageObjects.visualize.clickGo();
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/visualize/_inspector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export default function ({ getService, getPageObjects }) {

log.debug('Add Average Metric on machine.ram field');
await PageObjects.visualize.clickAddMetric();
await PageObjects.visualize.clickBucket('Y-Axis');
await PageObjects.visualize.clickBucket('Y-Axis', 'metric');
await PageObjects.visualize.selectAggregation('Average', 'metrics');
await PageObjects.visualize.selectField('machine.ram', 'metrics');
await PageObjects.visualize.clickGo();
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/visualize/_point_series_options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function ({ getService, getPageObjects }) {
log.debug('Add Metric');
await PageObjects.visualize.clickAddMetric();
log.debug('Metric = Value Axis');
await PageObjects.visualize.clickBucket('Y-Axis');
await PageObjects.visualize.clickBucket('Y-Axis', 'metric');
log.debug('Aggregation = Average');
await PageObjects.visualize.selectAggregation('Average', 'metrics');
log.debug('Field = memory');
Expand Down
2 changes: 0 additions & 2 deletions test/functional/apps/visualize/_tag_cloud.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,8 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.clickNewSearch();
log.debug('Set absolute time range from \"' + fromTime + '\" to \"' + toTime + '\"');
await PageObjects.header.setAbsoluteRange(fromTime, toTime);
await PageObjects.common.sleep(1000);
log.debug('select Tags');
await PageObjects.visualize.clickBucket('Tags');
await PageObjects.common.sleep(1000);
log.debug('Click aggregation Terms');
await PageObjects.visualize.selectAggregation('Terms');
log.debug('Click field machine.ram');
Expand Down
32 changes: 19 additions & 13 deletions test/functional/page_objects/visualize_page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,20 +392,26 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
}

// clickBucket(bucketType) 'X-Axis', 'Split Area', 'Split Chart'
async clickBucket(bucketName) {
const chartTypes = await retry.try(
async () => await find.allByCssSelector('li.list-group-item.list-group-menu-item'));
log.debug('found bucket types ' + chartTypes.length);

async function getChartType(chart) {
const chartString = await chart.getVisibleText();
if (chartString === bucketName) {
await chart.click();
await PageObjects.common.sleep(500);
async clickBucket(bucketName, type = 'bucket') {
const testSubject = type === 'bucket' ? 'bucketsAggGroup' : 'metricsAggGroup';
await retry.try(async () => {
const chartTypes = await retry.try(
async () => await find.allByCssSelector(`[data-test-subj="${testSubject}"] .list-group-menu-item`));
log.debug('found bucket types ' + chartTypes.length);

async function getChartType(chart) {
const chartString = await chart.getVisibleText();
if (chartString === bucketName) {
await chart.click();
return true;
}
}
}
const getChartTypesPromises = chartTypes.map(getChartType);
await Promise.all(getChartTypesPromises);
const getChartTypesPromises = chartTypes.map(getChartType);
const clickResult = await Promise.all(getChartTypesPromises);
if (!clickResult.some(result => result === true)) {
throw new Error(`bucket ${bucketName} not found`);
}
});
}

async selectAggregation(myString, groupName = 'buckets', childAggregationType = null) {
Expand Down