@@ -7,14 +7,14 @@ const process = require("process");
77const archive = require ( "../archive.js" ) ;
88const WebSocket = require ( "ws" ) ;
99const { type } = require ( "os" ) ;
10- const request = require ( "request" ) ;
11- const { del } = require ( "request" ) ;
1210const { delete_archive } = require ( "../archive.js" ) ;
1311const poller = require ( "../poller/poller.js" ) ;
1412const builds = require ( "../poller/build" ) ;
1513const batcher = require ( "./batcher.js" ) ;
1614const reports = require ( "../../../commands/generate_reports.js" ) ;
1715const { fail } = require ( "yargs" ) ;
16+ const https = require ( 'https' ) ;
17+ const axios = require ( 'axios' ) ;
1818
1919var batchCounter = 0 ;
2020var totalBatches = 0 ;
@@ -23,30 +23,18 @@ function run_test(payload, env = "prod", rejectUnauthorized) {
2323 return new Promise ( function ( resolve , reject ) {
2424 let options = {
2525 url : constants [ env ] . INTEGRATION_BASE_URL + constants . RUN_URL ,
26- body : payload ,
26+ data : payload ,
2727 } ;
2828 if ( rejectUnauthorized == false ) {
29- options [ "rejectUnauthorized" ] = false ;
29+ options . httpsAgent = new https . Agent ( { rejectUnauthorized : false } ) ;
3030 }
3131 let responseData = null ;
32- request . post ( options , function ( err , resp , body ) {
33- if ( err ) {
34- reject ( err ) ;
35- } else {
36- try {
37- responseData = JSON . parse ( body ) ;
38- } catch ( e ) {
39- console . log ( "Error in JSON response" , body ) ;
40- responseData = null ;
41- }
42- if ( resp . statusCode != 200 ) {
43- if ( responseData && responseData [ "error" ] ) {
44- reject ( responseData [ "error" ] ) ;
45- } else {
46- reject ( responseData ) ;
47- }
48- } else {
49- build_id = responseData [ "value" ] [ "message" ]
32+
33+ axios . post ( options . url , options . data , options )
34+ . then ( response => {
35+ responseData = response . data ;
36+ // console.log(response);
37+ build_id = responseData [ "value" ] [ "message" ]
5038 . split ( "=" )
5139 [ responseData [ "value" ] [ "message" ] . split ( "=" ) . length - 1 ] . split (
5240 "&"
@@ -79,9 +67,30 @@ function run_test(payload, env = "prod", rejectUnauthorized) {
7967 }
8068 resolve ( session_id ) ;
8169 }
70+ } )
71+ . catch ( error => {
72+ if ( error . response ) {
73+ // The request was made and the server responded with a status code
74+ // that falls out of the range of 2xx
75+ if ( error . response . status != 200 ) {
76+ if ( error . response && error . response . data ) {
77+ reject ( error . response . data ) ;
78+ } else {
79+ reject ( error . response ) ;
80+ }
81+ } else {
82+ reject ( error . response ) ;
8283 }
84+ } else if ( error . request ) {
85+ // The request was made but no response was received
86+ // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
87+ // http.ClientRequest in node.js
88+ reject ( error . cause ) ;
89+ } else {
90+ reject ( error ) ;
8391 }
84- } ) ;
92+ } )
93+
8594 } ) ;
8695}
8796
0 commit comments