Skip to content

Commit 3bb5717

Browse files
authored
test(opentelemetry-configuration): ensure process.env is cleaned up after envVariableSubstitution() tests (#6026)
1 parent a93b1dc commit 3bb5717

File tree

2 files changed

+42
-34
lines changed

2 files changed

+42
-34
lines changed

experimental/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ For notes on migrating to 2.x / 0.200.x see [the upgrade guide](doc/upgrade-to-2
3333
* test(opentelemetry-configuration): preserve special process.env behavior [#6010](https://github.com/open-telemetry/opentelemetry-js/pull/6010) @cjihrig
3434
* test(sdk-logs): ensure process.env is cleaned up between tests [#6017](https://github.com/open-telemetry/opentelemetry-js/pull/6017) @cjihrig
3535
* test(otlp-grpc-exporter-base): remove duplicated delete statements [#6022](https://github.com/open-telemetry/opentelemetry-js/pull/6022) @cjihrig
36+
* test(opentelemetry-configuration): ensure process.env is cleaned up after envVariableSubstitution tests [#6026](https://github.com/open-telemetry/opentelemetry-js/pull/6026) @cjihrig
3637

3738
## 0.206.0
3839

experimental/packages/opentelemetry-configuration/test/utils.test.ts

Lines changed: 41 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -145,40 +145,47 @@ describe('config utils', function () {
145145
]);
146146
});
147147

148-
it('should return correct values for envVariableSubstitution', function () {
149-
process.env.TEST1 = 't1';
150-
process.env.TEST2 = 't2';
151-
process.env.TEST_LONG_NAME = '100';
152-
process.env.TEST_ENDPOINT = 'http://test.com:4318/v1/traces';
153-
assert.deepStrictEqual(envVariableSubstitution(null), undefined);
154-
assert.deepStrictEqual(envVariableSubstitution(' '), ' ');
155-
assert.deepStrictEqual(envVariableSubstitution('${TEST1}'), 't1');
156-
assert.deepStrictEqual(
157-
envVariableSubstitution('${TEST1},${TEST2}'),
158-
't1,t2'
159-
);
160-
assert.deepStrictEqual(envVariableSubstitution('${TEST_LONG_NAME}'), '100');
161-
assert.deepStrictEqual(envVariableSubstitution('${TEST3}'), '');
162-
assert.deepStrictEqual(
163-
envVariableSubstitution('${TEST3:-backup}'),
164-
'backup'
165-
);
166-
assert.deepStrictEqual(
167-
envVariableSubstitution(
168-
'${TEST_ENDPOINT:-http://localhost:4318/v1/traces}'
169-
),
170-
'http://test.com:4318/v1/traces'
171-
);
172-
assert.deepStrictEqual(
173-
envVariableSubstitution(
174-
'${TEST_NON_EXISTING:-http://localhost:4318/v1/traces}'
175-
),
176-
'http://localhost:4318/v1/traces'
177-
);
148+
describe('envVariableSubstitution()', function () {
149+
afterEach(function () {
150+
delete process.env.TEST1;
151+
delete process.env.TEST2;
152+
delete process.env.TEST_LONG_NAME;
153+
delete process.env.TEST_ENDPOINT;
154+
});
178155

179-
delete process.env.TEST1;
180-
delete process.env.TEST2;
181-
delete process.env.TEST_LONG_NAME;
182-
delete process.env.TEST_ENDPOINT;
156+
it('should return correct values for envVariableSubstitution', function () {
157+
process.env.TEST1 = 't1';
158+
process.env.TEST2 = 't2';
159+
process.env.TEST_LONG_NAME = '100';
160+
process.env.TEST_ENDPOINT = 'http://test.com:4318/v1/traces';
161+
assert.deepStrictEqual(envVariableSubstitution(null), undefined);
162+
assert.deepStrictEqual(envVariableSubstitution(' '), ' ');
163+
assert.deepStrictEqual(envVariableSubstitution('${TEST1}'), 't1');
164+
assert.deepStrictEqual(
165+
envVariableSubstitution('${TEST1},${TEST2}'),
166+
't1,t2'
167+
);
168+
assert.deepStrictEqual(
169+
envVariableSubstitution('${TEST_LONG_NAME}'),
170+
'100'
171+
);
172+
assert.deepStrictEqual(envVariableSubstitution('${TEST3}'), '');
173+
assert.deepStrictEqual(
174+
envVariableSubstitution('${TEST3:-backup}'),
175+
'backup'
176+
);
177+
assert.deepStrictEqual(
178+
envVariableSubstitution(
179+
'${TEST_ENDPOINT:-http://localhost:4318/v1/traces}'
180+
),
181+
'http://test.com:4318/v1/traces'
182+
);
183+
assert.deepStrictEqual(
184+
envVariableSubstitution(
185+
'${TEST_NON_EXISTING:-http://localhost:4318/v1/traces}'
186+
),
187+
'http://localhost:4318/v1/traces'
188+
);
189+
});
183190
});
184191
});

0 commit comments

Comments
 (0)