Skip to content

chore: update tests because of custom json encoder #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mat001 merged 2 commits into from
Sep 26, 2022
Merged

chore: update tests because of custom json encoder #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfcedb3
chore: update tests because of custome json encoder
Mat001 Sep 26, 2022
3bf9c0e
update github ticket reference check
Mat001 Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ticket_reference_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
- name: Check for Jira ticket reference
uses: optimizely/github-action-ticket-reference-checker-public@master
with:
bodyRegex: 'OASIS-(?<ticketNumber>\d+)'
bodyRegex: 'FSSDK-(?<ticketNumber>\d+)'
11 changes: 6 additions & 5 deletions tests/test_odp_zaius_rest_api_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from requests import exceptions as request_exception

from optimizely.helpers.enums import OdpRestApiConfig
from optimizely.odp.odp_event import OdpEvent, OdpEventEncoder
from optimizely.odp.zaius_rest_api_manager import ZaiusRestApiManager
from . import base

Expand All @@ -26,10 +27,9 @@ class ZaiusRestApiManagerTest(base.BaseTest):
user_value = "test-user-value"
api_key = "test-api-key"
api_host = "test-host"

events = [
{"type": "t1", "action": "a1", "identifiers": {"id-key-1": "id-value-1"}, "data": {"key-1": "value1"}},
{"type": "t2", "action": "a2", "identifiers": {"id-key-2": "id-value-2"}, "data": {"key-2": "value2"}},
OdpEvent('t1', 'a1', {"id-key-1": "id-value-1"}, {"key-1": "value1"}),
OdpEvent('t2', 'a2', {"id-key-2": "id-value-2"}, {"key-2": "value2"})
]

def test_send_odp_events__valid_request(self):
Expand All @@ -42,7 +42,7 @@ def test_send_odp_events__valid_request(self):
request_headers = {'content-type': 'application/json', 'x-api-key': self.api_key}
mock_request_post.assert_called_once_with(url=self.api_host + "/v3/events",
headers=request_headers,
data=json.dumps(self.events),
data=json.dumps(self.events, cls=OdpEventEncoder),
timeout=OdpRestApiConfig.REQUEST_TIMEOUT)

def test_send_odp_ovents_success(self):
Expand All @@ -58,7 +58,8 @@ def test_send_odp_ovents_success(self):
self.assertFalse(should_retry)

def test_send_odp_events_invalid_json_no_retry(self):
events = {1, 2, 3} # using a set to trigger JSON-not-serializable error
"""Using a set to trigger JSON-not-serializable error."""
events = {1, 2, 3}

with mock.patch('requests.post') as mock_request_post, \
mock.patch('optimizely.logger') as mock_logger:
Expand Down