Skip to content

Commit c3d62fa

Browse files
committed
DBQ-559 : Jenkins pipeline hang on running RowBatcher tests
1 parent 8fc9a03 commit c3d62fa

File tree

5 files changed

+46
-34
lines changed

5 files changed

+46
-34
lines changed

package-lock.json

Lines changed: 43 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-basic/documents-data-movement-rows-queryAll.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ describe('data movement rows-queryAll', function() {
4444
try {
4545
testlib.findServerConfiguration(serverConfiguration);
4646
setTimeout(()=>{
47-
if(serverConfiguration.serverVersion >= 12){
48-
this.skip();
49-
}
5047
setUp(done);
5148
}, 3000);
5249
} catch(error){
@@ -55,7 +52,6 @@ describe('data movement rows-queryAll', function() {
5552
});
5653

5754
after(function(done){
58-
if(serverConfiguration.serverVersion < 12){
5955
const q = marklogic.queryBuilder;
6056
const ctsQb = marklogic.ctsQueryBuilder;
6157
const query = q.where(ctsQb.cts.directoryQuery('/test/dataMovement/requests/exporting-rows/'));
@@ -66,7 +62,6 @@ describe('data movement rows-queryAll', function() {
6662
.then(done());
6763
})
6864
});
69-
} else {done();}
7065
});
7166

7267
it('should queryAll documents with onCompletion, batchSize and concurrentRequests options', function (done){

test-basic/optic-fromDocUris.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('optic-update fromDocUris tests', function() {
5252
});
5353

5454
after(function (done) {
55-
if(serverConfiguration.serverVersion < 11){
55+
if(serverConfiguration.serverVersion >= 11){
5656
db.documents.remove(uris)
5757
.result(function (response) {
5858
done();

test-basic/plan-builder-generated.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ describe('plan builder', function() {
967967
testPlan([p.xs.string("LINESTRING(-112.25 47.1,-112.3 47.1,-112.4 47.2)")], p.geo.parseWkt(p.col("1")))
968968
.then(function(response) {
969969
const responseValue = (serverConfiguration.serverVersion >= 11)?"LINESTRING(-112.25 47.100002,-112.3 47.100002,-112.39999 47.199997)":
970-
"LINESTRING(-112.25 47.1,-112.3 47.1,-112.39999 47.2)";
970+
"LINESTRING(-112.25 47.1,-112.3 47.1,-112.4 47.2)";
971971
should(getResult(response).value).eql(responseValue);
972972
done();
973973
}).catch(done);

test-basic/plan-views.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ describe('view', function() {
185185
should(output[0].id.value).equal(1);
186186
should(output[0].name.value).equal('Master 1');
187187
should(output[0].sourceDocCheck.value).equal(true);
188-
if(serverConfiguration.serverVersion >= 11){
188+
if(serverConfiguration.serverVersion < 11){
189189
should.not.exist(output[0].sourceDocId);
190190
}
191191
else{

0 commit comments

Comments
 (0)