Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/libraries/botbuilder-integrat…
Browse files Browse the repository at this point in the history
…ion-aiohttp/pip-cef70b0dd7
  • Loading branch information
tracyboehrer authored Dec 2, 2024
2 parents 99d506e + 394d3d6 commit b18b465
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@

from typing import List
import aiounittest
import sys
import os

sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
from botbuilder.core import BotAdapter, TurnContext
from botbuilder.core.teams import TeamsActivityHandler
from botbuilder.schema import (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,9 @@ def assert_choice(result, value, index, score, synonym=None):
resolution.score == score
), f"Invalid resolution.score of '{resolution.score}' for '{value}' choice."
if synonym:
assert ( # pylint: disable=assert-on-tuple
resolution.synonym == synonym,
f"Invalid resolution.synonym of '{resolution.synonym}' for '{value}' choice.",
)
assert (
resolution.synonym == synonym
), f"Invalid resolution.synonym of '{resolution.synonym}' for '{value}' choice."


_color_choices: List[str] = ["red", "green", "blue"]
Expand Down
2 changes: 1 addition & 1 deletion libraries/botbuilder-testing/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"botbuilder-core==4.17.0",
"botbuilder-dialogs==4.17.0",
"botbuilder-azure==4.17.0",
"pytest~=7.3.1",
"pytest~=8.3.3",
]

TESTS_REQUIRES = ["aiounittest==1.3.0"]
Expand Down
6 changes: 3 additions & 3 deletions libraries/botframework-connector/tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pytest-cov>=2.6.0
pytest~=7.3.1
pytest-cov>=5.0.0
pytest~=8.3.3
pyyaml==6.0.1
pytest-asyncio==0.23.8
pytest-asyncio==0.24.0
ddt==1.2.1
setuptools==72.1.0

0 comments on commit b18b465

Please sign in to comment.