ignore async event in tests instead

monti-apm · Nov 29, 2023 · bc45bcf · bc45bcf
1 parent f2faf8e
commit bc45bcf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ versions.json
 .idea
 .eslintcache
 .envrc
+/packages/*
diff --git a/lib/hijack/async.js b/lib/hijack/async.js
@@ -24,6 +24,7 @@ export function wrapFibers () {
   wrapped = true;
 
   let originalYield = Fibers.yield;
+
   Fibers.yield = function () {
     let kadiraInfo = Kadira._getInfo();
     if (kadiraInfo) {

diff --git a/tests/_helpers/helpers.js b/tests/_helpers/helpers.js
@@ -1,9 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 import { DDP } from 'meteor/ddp';
-const Future = Npm.require('fibers/future');
 import { MethodStore, TestData } from './globals';
 
+const Future = Npm.require('fibers/future');
+
 export const GetMeteorClient = function (_url) {
   const url = _url || Meteor.absoluteUrl();
   return DDP.connect(url, {retry: false});
@@ -31,7 +32,7 @@ export const EnableTrackingMethods = function () {
   // };
 };
 
-export const GetLastMethodEvents = function (_indices) {
+export const GetLastMethodEvents = function (_indices, ignore = []) {
   if (MethodStore.length < 1) {
     return [];
   }
@@ -43,7 +44,7 @@ export const GetLastMethodEvents = function (_indices) {
   return events;
 
   function isNotCompute (event) {
-    return event[0] !== 'compute';
+    return event[0] !== 'compute' && !ignore.includes(event[0]);
   }
 
   function filterFields (event) {

diff --git a/tests/hijack/db.js b/tests/hijack/db.js
@@ -138,7 +138,7 @@ Tinytest.add(
     });
     let client = GetMeteorClient();
     let result = client.call(methodId);
-    let events = GetLastMethodEvents([0, 2]);
+    let events = GetLastMethodEvents([0, 2], ['async']);
     let expected = [
       ['start',undefined,{userId: null, params: '[]'}],
       ['wait',undefined,{waitOn: []}],
@@ -174,7 +174,7 @@ Tinytest.add(
     });
     let client = GetMeteorClient();
     let result = client.call(methodId);
-    let events = GetLastMethodEvents([0, 2]);
+    let events = GetLastMethodEvents([0, 2], ['async']);
     let expected = [
       ['start',undefined,{userId: null, params: '[]'}],
       ['wait',undefined,{waitOn: []}],
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ versions.json @@
     .idea
     .eslintcache
     .envrc
+    /packages/*