8000 Merge branch 'master' into daveta-django-tests · rsliang/botbuilder-python@d2a1e37 · GitHub
[go: up one dir, main page]
Skip to content

Commit d2a1e37

Browse files
axelsrzaxelsrz
authored
Merge branch 'master' into daveta-django-tests
2 parents 7f25863 + 20fd85b commit d2a1e37

File tree

3 files changed

+9
-29
lines changed

3 files changed

+9
-29
lines changed

‎libraries/botbuilder-applicationinsights/tests/test_telemetry_waterfall.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from botbuilder.dialogs import (
2424
Dialog,
2525
DialogSet,
26+
DialogState,
2627
WaterfallDialog,
2728
WaterfallStepContext,
2829
DialogTurnResult,
@@ -45,8 +46,8 @@ def test_none_telemetry_client(self):
4546
# assert
4647
self.assertEqual(type(dialog.telemetry_client), NullTelemetryClient)
4748

48-
@skip('Pending Telemetry mock')
49-
@patch('test_telemetry_waterfall.ApplicationInsightsTelemetryClient')
49+
50+
@patch('botbuilder.applicationinsights.ApplicationInsightsTelemetryClient')
5051
async def test_execute_sequence_waterfall_steps(self, MockTelemetry):
5152
# arrange
5253

@@ -56,7 +57,7 @@ async def test_execute_sequence_waterfall_steps(self, MockTelemetry):
5657

5758

5859
# Create a DialogState property, DialogSet and register the WaterfallDialog.
59-
dialog_state = convo_state.create_property('dialogState')
60+
dialog_state = convo_state.create_property('dialogState')
6061
dialogs = DialogSet(dialog_state)
6162
async def step1(step) -> DialogTurnResult:
6263
await step.context.send_activity('bot responding.')
@@ -82,6 +83,7 @@ async def exec_test(turn_context: TurnContext) -> None:
8283
else:
8384
if results.status == DialogTurnStatus.Complete:
8485
await turn_context.send_activity(results.result)
86+
8587
await convo_state.save_changes(turn_context)
8688

8789
adapt = TestAdapter(exec_test)
@@ -100,8 +102,8 @@ async def exec_test(turn_context: TurnContext) -> None:
100102
]
101103
self.assert_telemetry_calls(telemetry, telemetry_calls)
102104

103-
@skip('Pending Telemetry mock')
104-
@patch('test_telemetry_waterfall.ApplicationInsightsTelemetryClient')
105+
106+
@patch('botbuilder.applicationinsights.ApplicationInsightsTelemetryClient')
105107
async def test_ensure_end_dialog_called(self, MockTelemetry):
106108
# arrange
107109

‎libraries/botbuilder-core/botbuilder/core/memory_storage.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Licensed under the MIT License.
33

44
from typing import Dict, List
5-
from copy import deepcopy
65
from .storage import Storage, StoreItem
76

87

@@ -25,7 +24,7 @@ async def read(self, keys: List[str]):
2524
try:
2625
for key in keys:
2726
if key in self.memory:
28-
data[key] = deepcopy(self.memory[key])
27+
data[key] = self.memory[key]
2928
except TypeError as e:
3029
raise e
3130

@@ -50,7 +49,7 @@ async def write(self, changes: Dict[str, StoreItem]):
5049
elif old_state.e_tag:
5150
old_state_etag = old_state.e_tag
5251

53-
new_state = deepcopy(new_value)
52+
new_state = new_value
5453

5554
# Set ETag if applicable
5655
if isinstance(new_value, StoreItem):

‎libraries/botbuilder-core/tests/test_memory_storage.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,6 @@ async def test_memory_storage_write_should_overwrite_when_new_e_tag_is_an_asteri
7171
data = await storage.read(['user'])
7272
assert data['user'].counter == 5
7373

74-
75-
async def test_memory_storage_write_should_raise_a_key_error_with_older_e_tag(self):
76-
storage = MemoryStorage()
77-
first_item = SimpleStoreItem(e_tag='0')
78-
79-
await storage.write({'user': first_item})
80-
81-
updated_item = (await storage.read(['user']))['user']
82-
updated_item.counter += 1
83-
await storage.write({'user': first_item})
84-
85-
try:
86-
await storage.write({'user': first_item})
87-
await storage.read(['user'])
88-
except KeyError as _:
89-
pass
90-
else:
91-
raise AssertionError("test_memory_storage_read_should_raise_a_key_error_with_invalid_e_tag(): should have "
92-
"raised a KeyError with an invalid e_tag.")
93-
94-
9574
async def test_memory_storage_read_with_invalid_key_should_return_empty_dict(self):
9675
storage = MemoryStorage()
9776
data = await storage.read(['test'])

0 commit comments

Comments
 (0)
0