Skip to content

Commit 05f822c

Browse files
committed
Minor enhancement.
- Default label to supplied region - Update documentation - Add more test cases - Update changelog file - Update make file to use specific mock - Bump up version - Update generated documentation to latest
1 parent c0ec81c commit 05f822c

File tree

6 files changed

+32
-10
lines changed

6 files changed

+32
-10
lines changed

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
0.0.14 (2015.07.29)
2+
===================
3+
4+
* Default label to supplied region
5+
* Update documentation
6+
* Add more test cases
7+
18
0.0.13 (2015.07.22)
29
===================
310

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ version:
4141

4242
install_devel_deps:
4343
pip install -e .
44-
pip install coverage mock
44+
pip install coverage mock==1.0.1
4545

4646
download:
4747
ifeq ($(CURL),)

doc/DynamoDBSQLLibrary.html

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

src/DynamoDBSQLLibrary/keywords/session.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,15 @@ def create_dynamodb_session(self, *args, **kwargs):
5757
5858
:param bool `is_secure`: Enforce https connection. (Default True)
5959
60-
:param str `label`: Session label, a case and space insensitive string.
60+
:param str `label`: Session label, a case and space insensitive string. (Default :param str `region`)
6161
6262
Examples:
63-
| Create DynamoDB Session | region=us-west-1 | access_key=KEY | secret_key=SECRET | label=LABEL |
63+
| Create DynamoDB Session | us-west-1 | access_key=KEY | secret_key=SECRET | | # Label is us-west-1 |
64+
| Create DynamoDB Session | us-west-1 | access_key=KEY | secret_key=SECRET | label=LABEL | # Label is LABEL |
6465
"""
6566
# pylint: disable=line-too-long
66-
label = kwargs.pop('label', self._string.generate_random_string(32))
67+
kargs = dict(enumerate(args))
68+
label = kwargs.pop('label', kargs.get(0, self._string.generate_random_string(32)))
6769
self._builtin.log('Creating DynamoDB session: %s' % label, 'DEBUG')
6870
session = Engine()
6971
session.connect(*args, **kwargs)

src/DynamoDBSQLLibrary/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
Amazon DynamoDB SQL Library - an Amazon DynamoDB testing library with SQL-like DSL.
2222
"""
2323

24-
VERSION = '0.0.13'
24+
VERSION = '0.0.14'
2525

2626

2727
def get_version():

test/utest/test_session.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,24 @@ def test_class_should_initiate(self):
4747

4848
def test_create_should_register_new_session(self):
4949
"""Create session should successfully register new session."""
50-
self.session.create_dynamodb_session(self.region, label=self.label)
50+
label = self.session.create_dynamodb_session(self.region, label=self.label)
51+
self.assertEqual(label, self.label)
52+
self.assertNotEqual(label, self.region)
5153
try:
52-
self.session._cache.switch(self.label)
54+
self.session._cache.switch(label)
55+
except RuntimeError:
56+
self.fail("Label '%s' should be exist." % label)
57+
self.session.delete_all_dynamodb_sessions()
58+
59+
def test_create_should_register_with_region_as_label(self):
60+
"""Create session should successfully register new session with region as default label."""
61+
label = self.session.create_dynamodb_session(self.region)
62+
self.assertNotEqual(label, self.label)
63+
self.assertEqual(label, self.region)
64+
try:
65+
self.session._cache.switch(label)
5366
except RuntimeError:
54-
self.fail("Label '%s' should be exist." % self.label)
67+
self.fail("Label '%s' should be exist." % label)
5568
self.session.delete_all_dynamodb_sessions()
5669

5770
def test_delete_should_remove_all_sessions(self):

0 commit comments

Comments
 (0)