Skip to content

Commit b6e18f9

Browse files
authored
Merge pull request #50 from mathworks/fixing_tests
Correctly clearing meter providers
2 parents b7bb9cf + 2bff102 commit b6e18f9

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

test/tmetrics.m

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ function testAddMetricReader(testCase)
105105
% adding a single value
106106
ct.add(1);
107107
pause(2.5);
108-
verifyTrue(testCase, p.shutdown());
108+
clear p;
109109
results = readJsonResults(testCase);
110110
result_count = numel(results);
111111
verifyEqual(testCase,result_count, 2);
@@ -140,7 +140,7 @@ function testCounterBasic(testCase)
140140
pause(2.5);
141141

142142
% fetch result
143-
verifyTrue(testCase, p.shutdown());
143+
clear p;
144144
results = readJsonResults(testCase);
145145
results = results{end};
146146

@@ -184,7 +184,7 @@ function testCounterDelta(testCase)
184184

185185
% fetch results
186186
pause(2.5);
187-
verifyTrue(testCase, p.shutdown());
187+
clear p;
188188
results = readJsonResults(testCase);
189189
dp1 = results{1}.resourceMetrics.scopeMetrics.metrics.sum.dataPoints;
190190
dp2 = results{2}.resourceMetrics.scopeMetrics.metrics.sum.dataPoints;
@@ -223,7 +223,7 @@ function testCounterAddAttributes(testCase)
223223
pause(2.5);
224224

225225
% fetch result
226-
verifyTrue(testCase, p.shutdown());
226+
clear p;
227227
results = readJsonResults(testCase);
228228
results = results{end};
229229

@@ -267,7 +267,7 @@ function testCounterAddNegative(testCase)
267267
pause(2.5);
268268

269269
% fetch results
270-
verifyTrue(testCase, p.shutdown());
270+
clear p;
271271
results = readJsonResults(testCase);
272272
results = results{end};
273273
dp = results.resourceMetrics.scopeMetrics.metrics.sum.dataPoints;
@@ -307,7 +307,7 @@ function testUpDownCounterBasic(testCase)
307307
pause(5);
308308

309309
% fetch result
310-
verifyTrue(testCase, p.shutdown());
310+
clear p;
311311
results = readJsonResults(testCase);
312312
results = results{end};
313313

@@ -352,7 +352,7 @@ function testUpDownCounterAddAttributes(testCase)
352352
pause(5);
353353

354354
% fetch result
355-
verifyTrue(testCase, p.shutdown());
355+
clear p;
356356
results = readJsonResults(testCase);
357357
results = results{end};
358358
dp = results.resourceMetrics.scopeMetrics.metrics.sum.dataPoints;
@@ -401,7 +401,7 @@ function testHistogramBasic(testCase)
401401
pause(10);
402402

403403
% fetch results
404-
verifyTrue(testCase, p.shutdown());
404+
clear p;
405405
results = readJsonResults(testCase);
406406
results = results{end};
407407
dp = results.resourceMetrics.scopeMetrics.metrics.histogram.dataPoints;
@@ -458,7 +458,7 @@ function testHistogramRecordAttributes(testCase)
458458
pause(10);
459459

460460
% fetch results
461-
verifyTrue(testCase, p.shutdown());
461+
clear p;
462462
results = readJsonResults(testCase);
463463
results = results{end};
464464
dp = results.resourceMetrics.scopeMetrics.metrics.histogram.dataPoints;
@@ -515,7 +515,7 @@ function testHistogramDelta(testCase)
515515
pause(2.5);
516516

517517
% fetch results
518-
verifyTrue(testCase, p.shutdown());
518+
clear p;
519519
results = readJsonResults(testCase);
520520
rsize = size(results);
521521
for i = 1:rsize(2)

test/tmetrics_sdk.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ function testCustomResource(testCase)
5353

5454
pause(2.5);
5555

56+
clear mp;
57+
5658
% perform test comparisons
5759
results = readJsonResults(testCase);
5860
results = results{1};

0 commit comments

Comments
 (0)