Fix broken unit tests and update unreleased changes

Author: haotianw465

.gitignore

@@ -2,6 +2,7 @@
 *.pyc
 .Python
 .cache
+.pytest_cache
 man
 
 build

CHANGELOG.rst

@@ -4,7 +4,10 @@ CHANGELOG
 
 Unreleased
 ==========
-* bugfix: Fixed an issue that caused annotation keys with invalid characters to be silently ignored.
+* feature: Add support for SQLAlchemy and Flask-SQLAlcemy. `PR14 <https://github.com/aws/aws-xray-sdk-python/pull/14>`_.
+* feature: Add support for PynamoDB calls to DynamoDB. `PR13 <https://github.com/aws/aws-xray-sdk-python/pull/13>`_.
+* bugfix:  Drop invalid annotation keys and log a warning. `PR22 <https://github.com/aws/aws-xray-sdk-python/pull/22>`_.
+* bugfix:  Respect `with` statement on cursor objects in dbapi2 patcher. `PR17 <https://github.com/aws/aws-xray-sdk-python/pull/17>`_.
 
 0.95
 ====

aws_xray_sdk/ext/dbapi2.py

@@ -34,7 +34,7 @@ def __init__(self, cursor, meta={}):
             self._xray_meta['database_type'] = db_type
 
     def __enter__(self):
-        
+
         value = self.__wrapped__.__enter__()
         if value is not self.__wrapped__:
             return value

tests/ext/django/test_middleware.py

@@ -10,7 +10,8 @@ class XRayTestCase(TestCase):
 
     def setUp(self):
         django.setup()
-        xray_recorder.configure(service='test', sampling=False, context=Context())
+        xray_recorder.configure(context=Context(),
+                                context_missing='LOG_ERROR')
         xray_recorder.clear_trace_entities()
 
     def tearDown(self):

tests/ext/pynamodb/test_pynamodb.py

@@ -2,7 +2,6 @@
 import pytest
 from botocore.exceptions import ClientError
 from pynamodb.attributes import UnicodeAttribute
-from pynamodb.exceptions import VerboseClientError
 from pynamodb.models import Model
 
 from aws_xray_sdk.core import patch
@@ -36,7 +35,7 @@ class Meta:
 
     try:
         SampleModel.describe_table()
-    except VerboseClientError:
+    except Exception:
         pass
 
     subsegments = xray_recorder.current_segment().subsegments

tests/test_trace_entities.py

@@ -52,8 +52,8 @@ def test_put_annotation():
         'key2': 'value2',
     }
     # invalid annotation key-value pair should be dropped
-    segment.put_annotation('invalid_value', invalid)
-    segment.put_annotation('invalid-key', invalid)
+    segment.put_annotation('valid_key', invalid)
+    segment.put_annotation('invalid-key', 'validvalue')
     segment.put_annotation('number', 1)
 
     subsegment = Subsegment('sub', 'local', segment)