Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix the fix (#10574)

This commit is contained in:
Jan 2019-11-28 18:45:23 +01:00 committed by KVS85
parent 4bab40e6ba
commit 0f8897f9c6
1 changed files with 68 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
tests/js/common/shell/shell-query-spec.js
View File

@ -148,21 +148,38 @@ describe('AQL query analyzer', function () {
it('should be able to get currently running queries', function () { it('should be able to get currently running queries', function () {
sendQuery(1, true); sendQuery(1, true);
expect(testee.current().filter(filterQueries).length).to.equal(1); let q;
let counter = 0;
while (++counter < 10) {
q = testee.current().filter(filterQueries).length;
if (q > 0) {
break;
}
internal.wait(0.25, false);
}
expect(q).to.equal(1);
}); });
it('should have proper running query descriptions', function () { it('should have proper running query descriptions', function () {
sendQuery(1, true); sendQuery(1, true);
let queries = testee.current().filter(filterQueries); let q;
expect(queries.length).to.equal(1); let counter = 0;
expect(queries[0]).to.have.property('id'); while (++counter < 10) {
expect(queries[0]).to.have.property('query', query); q = testee.current().filter(filterQueries);
expect(queries[0]).to.have.property('bindVars'); if (q.length > 0) {
expect(queries[0].bindVars).to.eql({ value: 1 }); break;
expect(queries[0]).to.have.property('started'); }
expect(queries[0]).to.have.property('runTime'); internal.wait(0.25, false);
expect(queries[0]).to.have.property('state', 'executing'); }
expect(queries[0]).to.have.property('stream', false); expect(q.length).to.equal(1);
expect(q[0]).to.have.property('id');
expect(q[0]).to.have.property('query', query);
expect(q[0]).to.have.property('bindVars');
expect(q[0].bindVars).to.eql({ value: 1 });
expect(q[0]).to.have.property('started');
expect(q[0]).to.have.property('runTime');
expect(q[0]).to.have.property('state', 'executing');
expect(q[0]).to.have.property('stream', false);
}); });
it('should have proper running query descriptions, without bind vars', function () { it('should have proper running query descriptions, without bind vars', function () {
@ -170,16 +187,24 @@ describe('AQL query analyzer', function () {
trackBindVars: false trackBindVars: false
}); });
sendQuery(1, true); sendQuery(1, true);
let queries = testee.current().filter(filterQueries); let q;
expect(queries.length).to.equal(1); let counter = 0;
expect(queries[0]).to.have.property('id'); while (++counter < 10) {
expect(queries[0]).to.have.property('query', query); q = testee.current().filter(filterQueries);
expect(queries[0]).to.have.property('bindVars'); if (q.length > 0) {
expect(queries[0].bindVars).to.eql({ }); break;
expect(queries[0]).to.have.property('started'); }
expect(queries[0]).to.have.property('runTime'); internal.wait(0.25, false);
expect(queries[0]).to.have.property('state', 'executing'); }
expect(queries[0]).to.have.property('stream', false); expect(q.length).to.equal(1);
expect(q[0]).to.have.property('id');
expect(q[0]).to.have.property('query', query);
expect(q[0]).to.have.property('bindVars');
expect(q[0].bindVars).to.eql({ });
expect(q[0]).to.have.property('started');
expect(q[0]).to.have.property('runTime');
expect(q[0]).to.have.property('state', 'executing');
expect(q[0]).to.have.property('stream', false);
}); });
it('should not track queries if turned off', function () { it('should not track queries if turned off', function () {
@ -296,17 +321,33 @@ describe('AQL query analyzer', function () {
trackBindVars: false trackBindVars: false
}); });
sendQuery(1, true); sendQuery(1, true);
let list = testee.current().filter(filterQueries); let q;
expect(list.length).to.equal(1); let counter = 0;
while (++counter < 10) {
q = testee.current().filter(filterQueries);
if (q.length > 0) {
break;
}
internal.wait(0.25, false);
}
expect(q.length).to.equal(1);
}); });
it('should be able to kill a query', function () { it('should be able to kill a query', function () {
sendQuery(1, true); sendQuery(1, true);
let list = testee.current().filter(filterQueries); let q;
expect(list.length).to.equal(1); let counter = 0;
while (++counter < 10) {
q = testee.current().filter(filterQueries);
if (q.length > 0) {
break;
}
internal.wait(0.25, false);
}
expect(q.length).to.equal(1);
expect(function () { expect(function () {
testee.kill(list[0].id); testee.kill(q[0].id);
list = testee.current().filter(filterQueries); let list = testee.current().filter(filterQueries);
for (let i = 0; i < 10 && list.length > 0; ++i) { for (let i = 0; i < 10 && list.length > 0; ++i) {
internal.wait(0.1); internal.wait(0.1);
list = testee.current().filter(filterQueries); list = testee.current().filter(filterQueries);