added clean up in tests and minor changes

Author: bhautikpip

aws_xray_sdk/core/models/dummy_entities.py

@@ -16,8 +16,8 @@ class DummySegment(Segment):
     """
 
     def __init__(self, name='dummy'):
-        noOpID = os.getenv('AWS_XRAY_NOOP_ID')
-        if not noOpID or noOpID.lower() == 'true':
+        no_op_id = os.getenv('AWS_XRAY_NOOP_ID')
+        if not no_op_id or no_op_id.lower() == 'true':
             super(DummySegment, self).__init__(name=name, traceid=NoOpTraceId().to_id(), entityid='0000000000000000')
         else:
             super(DummySegment, self).__init__(name=name, traceid=TraceId().to_id())
@@ -88,8 +88,8 @@ class DummySubsegment(Subsegment):
 
     def __init__(self, segment, name='dummy'):
         super(DummySubsegment, self).__init__(name, 'dummy', segment)
-        noOpID = os.getenv('AWS_XRAY_NOOP_ID')
-        if not noOpID or noOpID.lower() == 'true':
+        no_op_id = os.getenv('AWS_XRAY_NOOP_ID')
+        if not no_op_id or no_op_id.lower() == 'true':
             super(Subsegment, self).__init__(name, entity_id='0000000000000000')
         self.sampled = False
 

tests/test_traceid.py

@@ -1,9 +1,21 @@
 import os
+import pytest
 from aws_xray_sdk.core import xray_recorder
-
 from aws_xray_sdk.core.models.traceid import TraceId
 
 
+@pytest.fixture(autouse=True)
+def cleanup():
+    """
+    Clean up Environmental Variable for enable before and after tests
+    """
+    if 'AWS_XRAY_NOOP_ID' in os.environ:
+        del os.environ['AWS_XRAY_NOOP_ID']
+    yield
+    if 'AWS_XRAY_NOOP_ID' in os.environ:
+        del os.environ['AWS_XRAY_NOOP_ID']
+
+
 def test_id_format():
     trace_id = TraceId().to_id()
     assert len(trace_id) == 35
@@ -58,7 +70,6 @@ def test_id_generation_noop_true():
 
     # Close the segment
     xray_recorder.end_segment()
-    os.unsetenv('AWS_XRAY_NOOP_ID')
 
     assert segment.id == '0000000000000000'
     assert segment.trace_id == '1-00000000-000000000000000000000000'
@@ -77,7 +88,6 @@ def test_id_generation_noop_false():
 
     # Close the segment
     xray_recorder.end_segment()
-    os.unsetenv('AWS_XRAY_NOOP_ID')
 
     assert segment.id != '0000000000000000'
     assert segment.trace_id != '1-00000000-000000000000000000000000'