Skip to content

Commit

Permalink
Merge commit 'f03058c825343e6dfd3167fcce68cc0a4c2d8445' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	osbot_fast_api/api/Fast_API__Http_Events.py
#	osbot_fast_api/utils/testing/Mock_Obj__Fast_API__Request_Data.py
#	tests/unit/api/test_Fast_API__Http_Events.py
#	tests/unit/utils/testing/test_Mock_Obj__Fast_API__Request_Data.py
  • Loading branch information
DinisCruz committed Sep 21, 2024
2 parents 1aa8c4b + f03058c commit 163377c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
16 changes: 7 additions & 9 deletions osbot_fast_api/utils/testing/Mock_Obj__Fast_API__Request_Data.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
from osbot_fast_api.api.Fast_API__Http_Event import Fast_API__Http_Event
from osbot_fast_api.api.Fast_API__Http_Event__Info import Fast_API__Http_Event__Info
from osbot_utils.base_classes.Type_Safe import Type_Safe
from fastapi import Request
from starlette.responses import Response
from starlette.datastructures import Address

from osbot_utils.utils.Dev import pprint
from osbot_utils.utils.Misc import str_to_bytes
from osbot_fast_api.api.Fast_API__Http_Event import Fast_API__Http_Event
from osbot_fast_api.api.Fast_API__Http_Event__Info import Fast_API__Http_Event__Info
from osbot_utils.base_classes.Type_Safe import Type_Safe
from fastapi import Request
from starlette.responses import Response
from starlette.datastructures import Address
from osbot_utils.utils.Misc import str_to_bytes

HEADER_NAME__CITY = 'cloudfront-viewer-city'
HEADER_NAME__COUNTRY = 'cloudfront-viewer-country'
Expand Down
8 changes: 3 additions & 5 deletions tests/unit/api/test_Fast_API__Http_Events.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import os
from collections import deque
from decimal import Decimal
from unittest import TestCase

import pytest
from collections import deque
from decimal import Decimal
from unittest import TestCase
from fastapi import Request
from starlette.responses import Response
from starlette.datastructures import MutableHeaders, Address
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from osbot_fast_api.api.Fast_API__Http_Event import Fast_API__Http_Event
from decimal import Decimal
from unittest import TestCase
from osbot_fast_api.api.Fast_API__Http_Event import Fast_API__Http_Event
from osbot_fast_api.utils.testing.Mock_Obj__Fast_API__Request_Data import Mock_Obj__Fast_API__Request_Data
from osbot_fast_api.utils.testing.Mock_Obj__Fast_API__Request_Data import Mock_Obj__Fast_API__Request_Data


class test_Mock_Obj__Fast_API__Request_Data(TestCase):
Expand Down

0 comments on commit 163377c

Please sign in to comment.