55
66import Collations from '../../lib/const/collations.js' ;
77import Conf from '../conf.js' ;
8- import Connection from '../../lib/connection' ;
9- import ConnOptions from '../../lib/config/connection-options' ;
8+ import Connection from '../../lib/connection.js ' ;
9+ import ConnOptions from '../../lib/config/connection-options.js ' ;
1010import { isMaxscale , getHostSuffix , createConnection , createCallbackConnection , utf8Collation } from '../base.js' ;
1111import { expect , assert , describe , test , beforeAll , afterAll } from 'vitest' ;
1212
@@ -114,7 +114,9 @@ describe.concurrent('connection', () => {
114114 assert . isTrue ( err . message . includes ( 'close forced' ) ) ;
115115 resolve ( ) ;
116116 } ) ;
117- process . nextTick ( conn . __tests . getSocket ( ) . destroy . bind ( conn . __tests . getSocket ( ) , new Error ( 'close forced' ) ) ) ;
117+ setTimeout ( ( ) => {
118+ conn . __tests . getSocket ( ) . destroy ( new Error ( 'close forced' ) ) ;
119+ } , 0 ) ;
118120 } ) ;
119121 } ) ;
120122
@@ -126,7 +128,9 @@ describe.concurrent('connection', () => {
126128 assert . isTrue ( err . message . includes ( 'Connection timeout: failed to create socket after' ) ) ;
127129 resolve ( ) ;
128130 } ) ;
129- process . nextTick ( conn . __tests . getSocket ( ) . destroy . bind ( conn . __tests . getSocket ( ) ) ) ;
131+ setTimeout ( ( ) => {
132+ conn . __tests . getSocket ( ) . destroy ( ) ;
133+ } , 0 ) ;
130134 } ) ;
131135 } ) ;
132136
@@ -760,25 +764,25 @@ describe.concurrent('connection', () => {
760764 test ( 'pause socket' , async ( ) => {
761765 const conn = await createConnection ( ) ;
762766 conn . pause ( ) ;
763- const startTime = process . hrtime ( ) ;
767+ const startTime = performance . now ( ) ;
764768 setTimeout ( ( ) => {
765769 conn . resume ( ) ;
766770 } , 500 ) ;
767771
768772 const rows = await conn . query ( "SELECT '1'" ) ;
769773 assert . deepEqual ( rows , [ { 1 : '1' } ] ) ;
770- const diff = process . hrtime ( startTime ) ;
774+ const diff = performance . now ( ) - startTime ;
771775 await conn . end ( ) ;
772776 //query has taken more than 500ms
773- assert . isTrue ( diff [ 1 ] > 499000000 , ' diff[1] :' + diff [ 1 ] + ' expected to be more than 500000000 ' ) ;
777+ assert . isTrue ( diff > 499 , ' diff:' + diff + ' expected to be more than 500 ' ) ;
774778 } ) ;
775779
776780 test ( 'pause socket callback' , async ( ) => {
777781 const conn = createCallbackConnection ( ) ;
778782 await new Promise ( ( resolve , reject ) => {
779783 conn . connect ( ( err ) => {
780784 conn . pause ( ) ;
781- const startTime = process . hrtime ( ) ;
785+ const startTime = performance . now ( ) ;
782786 setTimeout ( ( ) => {
783787 conn . resume ( ) ;
784788 } , 500 ) ;
@@ -788,9 +792,9 @@ describe.concurrent('connection', () => {
788792 reject ( err ) ;
789793 } else {
790794 assert . deepEqual ( rows , [ { 1 : '1' } ] ) ;
791- const diff = process . hrtime ( startTime ) ;
795+ const diff = performance . now ( ) - startTime ;
792796 //query has taken more than 500ms
793- assert . isTrue ( diff [ 1 ] > 499000000 , ' diff[1] :' + diff [ 1 ] + ' expected to be more than 500000000 ' ) ;
797+ assert . isTrue ( diff > 499 , ' diff:' + diff + ' expected to be more than 500 ' ) ;
794798 conn . end ( ) ;
795799 resolve ( ) ;
796800 }
@@ -934,7 +938,7 @@ describe.concurrent('connection', () => {
934938 } ) ;
935939 throw new Error ( 'must have thrown error !' ) ;
936940 } catch ( err ) {
937- console . log ( err ) ;
941+ // console.log(err);
938942 assert . equal ( err . sqlState , 'HY000' , err . message ) ;
939943 assert . equal ( err . code , 'ER_MUST_CHANGE_PASSWORD_LOGIN' ) ;
940944 } finally {
0 commit comments