fix: format all code with black

and from now on should not deviate from that...
This commit is contained in:
Lance Edgar 2025-08-31 12:45:58 -05:00
parent e20ef31ff7
commit 1b01df79e2
9 changed files with 312 additions and 144 deletions

View file

@ -8,32 +8,35 @@
from importlib.metadata import version as get_version from importlib.metadata import version as get_version
project = 'Wutta-Continuum' project = "Wutta-Continuum"
copyright = '2024, Lance Edgar' copyright = "2024, Lance Edgar"
author = 'Lance Edgar' author = "Lance Edgar"
release = get_version('Wutta-Continuum') release = get_version("Wutta-Continuum")
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
extensions = [ extensions = [
'sphinx.ext.autodoc', "sphinx.ext.autodoc",
'sphinx.ext.intersphinx', "sphinx.ext.intersphinx",
'sphinx.ext.viewcode', "sphinx.ext.viewcode",
'sphinx.ext.todo', "sphinx.ext.todo",
] ]
templates_path = ['_templates'] templates_path = ["_templates"]
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
intersphinx_mapping = { intersphinx_mapping = {
'sqlalchemy-continuum': ('https://sqlalchemy-continuum.readthedocs.io/en/latest/', None), "sqlalchemy-continuum": (
'wuttjamaican': ('https://docs.wuttaproject.org/wuttjamaican/', None), "https://sqlalchemy-continuum.readthedocs.io/en/latest/",
None,
),
"wuttjamaican": ("https://docs.wuttaproject.org/wuttjamaican/", None),
} }
# -- Options for HTML output ------------------------------------------------- # -- Options for HTML output -------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output # https://www.sphinx-doc.org/en/master/usage/configuration.html#options-for-html-output
html_theme = 'furo' html_theme = "furo"
html_static_path = ['_static'] html_static_path = ["_static"]

View file

@ -3,4 +3,4 @@
from importlib.metadata import version from importlib.metadata import version
__version__ = version('Wutta-Continuum') __version__ = version("Wutta-Continuum")

View file

@ -40,5 +40,6 @@ class WuttaContinuumAppProvider(AppProvider):
This checks the config value as described in This checks the config value as described in
:doc:`/narr/install`; default will be ``False``. :doc:`/narr/install`; default will be ``False``.
""" """
return self.config.get_bool('wutta_continuum.enable_versioning', return self.config.get_bool(
usedb=False, default=False) "wutta_continuum.enable_versioning", usedb=False, default=False
)

View file

@ -42,19 +42,23 @@ class WuttaContinuumConfigExtension(WuttaConfigExtension):
This adds a startup hook, which can optionally turn on the This adds a startup hook, which can optionally turn on the
SQLAlchemy-Continuum versioning features for the main app DB. SQLAlchemy-Continuum versioning features for the main app DB.
""" """
key = 'wutta_continuum'
key = "wutta_continuum"
def startup(self, config): def startup(self, config):
""" """ """ """
# only do this if config enables it # only do this if config enables it
if not config.get_bool('wutta_continuum.enable_versioning', if not config.get_bool(
usedb=False, default=False): "wutta_continuum.enable_versioning", usedb=False, default=False
):
return return
# create wutta plugin, to assign user and ip address # create wutta plugin, to assign user and ip address
spec = config.get('wutta_continuum.wutta_plugin_spec', spec = config.get(
"wutta_continuum.wutta_plugin_spec",
usedb=False, usedb=False,
default='wutta_continuum.conf:WuttaContinuumPlugin') default="wutta_continuum.conf:WuttaContinuumPlugin",
)
WuttaPlugin = load_object(spec) WuttaPlugin = load_object(spec)
# tell sqlalchemy-continuum to do its thing # tell sqlalchemy-continuum to do its thing
@ -109,10 +113,10 @@ class WuttaContinuumPlugin(Plugin):
remote_addr = self.get_remote_addr(uow, session) remote_addr = self.get_remote_addr(uow, session)
if remote_addr: if remote_addr:
kwargs['remote_addr'] = remote_addr kwargs["remote_addr"] = remote_addr
user_id = self.get_user_id(uow, session) user_id = self.get_user_id(uow, session)
if user_id: if user_id:
kwargs['user_id'] = user_id kwargs["user_id"] = user_id
return kwargs return kwargs

View file

@ -5,6 +5,7 @@ Revises: 71406251b8e7
Create Date: 2024-11-24 17:39:57.415425 Create Date: 2024-11-24 17:39:57.415425
""" """
from typing import Sequence, Union from typing import Sequence, Union
from alembic import op from alembic import op
@ -12,8 +13,8 @@ import sqlalchemy as sa
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision: str = '0a5f8ac0cd06' revision: str = "0a5f8ac0cd06"
down_revision: Union[str, None] = '71406251b8e7' down_revision: Union[str, None] = "71406251b8e7"
branch_labels: Union[str, Sequence[str], None] = None branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None
@ -21,10 +22,13 @@ depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None: def upgrade() -> None:
# user # user
op.add_column('user_version', sa.Column('prevent_edit', sa.Boolean(), autoincrement=False, nullable=True)) op.add_column(
"user_version",
sa.Column("prevent_edit", sa.Boolean(), autoincrement=False, nullable=True),
)
def downgrade() -> None: def downgrade() -> None:
# user # user
op.drop_column('user_version', 'prevent_edit') op.drop_column("user_version", "prevent_edit")

View file

@ -5,6 +5,7 @@ Revises:
Create Date: 2024-08-27 18:28:31.488291 Create Date: 2024-08-27 18:28:31.488291
""" """
from typing import Sequence, Union from typing import Sequence, Union
from alembic import op from alembic import op
@ -13,131 +14,283 @@ import wuttjamaican.db.util
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision: str = '71406251b8e7' revision: str = "71406251b8e7"
down_revision: Union[str, None] = None down_revision: Union[str, None] = None
branch_labels: Union[str, Sequence[str], None] = ('wutta_continuum',) branch_labels: Union[str, Sequence[str], None] = ("wutta_continuum",)
depends_on: Union[str, Sequence[str], None] = None depends_on: Union[str, Sequence[str], None] = None
def upgrade() -> None: def upgrade() -> None:
# transaction # transaction
op.create_table('transaction', op.create_table(
sa.Column('issued_at', sa.DateTime(), nullable=True), "transaction",
sa.Column('id', sa.BigInteger(), autoincrement=True, nullable=False), sa.Column("issued_at", sa.DateTime(), nullable=True),
sa.Column('remote_addr', sa.String(length=50), nullable=True), sa.Column("id", sa.BigInteger(), autoincrement=True, nullable=False),
sa.Column('user_id', wuttjamaican.db.util.UUID(), nullable=True), sa.Column("remote_addr", sa.String(length=50), nullable=True),
sa.ForeignKeyConstraint(['user_id'], ['user.uuid'], name=op.f('fk_transaction_user_id_user')), sa.Column("user_id", wuttjamaican.db.util.UUID(), nullable=True),
sa.PrimaryKeyConstraint('id', name=op.f('pk_transaction')) sa.ForeignKeyConstraint(
["user_id"], ["user.uuid"], name=op.f("fk_transaction_user_id_user")
),
sa.PrimaryKeyConstraint("id", name=op.f("pk_transaction")),
)
op.create_index(
op.f("ix_transaction_user_id"), "transaction", ["user_id"], unique=False
) )
op.create_index(op.f('ix_transaction_user_id'), 'transaction', ['user_id'], unique=False)
# person # person
op.create_table('person_version', op.create_table(
sa.Column('uuid', wuttjamaican.db.util.UUID(), autoincrement=False, nullable=False), "person_version",
sa.Column('full_name', sa.String(length=100), autoincrement=False, nullable=True), sa.Column(
sa.Column('first_name', sa.String(length=50), autoincrement=False, nullable=True), "uuid", wuttjamaican.db.util.UUID(), autoincrement=False, nullable=False
sa.Column('middle_name', sa.String(length=50), autoincrement=False, nullable=True), ),
sa.Column('last_name', sa.String(length=50), autoincrement=False, nullable=True), sa.Column(
sa.Column('transaction_id', sa.BigInteger(), autoincrement=False, nullable=False), "full_name", sa.String(length=100), autoincrement=False, nullable=True
sa.Column('end_transaction_id', sa.BigInteger(), nullable=True), ),
sa.Column('operation_type', sa.SmallInteger(), nullable=False), sa.Column(
sa.PrimaryKeyConstraint('uuid', 'transaction_id', name=op.f('pk_person_version')) "first_name", sa.String(length=50), autoincrement=False, nullable=True
),
sa.Column(
"middle_name", sa.String(length=50), autoincrement=False, nullable=True
),
sa.Column(
"last_name", sa.String(length=50), autoincrement=False, nullable=True
),
sa.Column(
"transaction_id", sa.BigInteger(), autoincrement=False, nullable=False
),
sa.Column("end_transaction_id", sa.BigInteger(), nullable=True),
sa.Column("operation_type", sa.SmallInteger(), nullable=False),
sa.PrimaryKeyConstraint(
"uuid", "transaction_id", name=op.f("pk_person_version")
),
)
op.create_index(
op.f("ix_person_version_end_transaction_id"),
"person_version",
["end_transaction_id"],
unique=False,
)
op.create_index(
op.f("ix_person_version_operation_type"),
"person_version",
["operation_type"],
unique=False,
)
op.create_index(
op.f("ix_person_version_transaction_id"),
"person_version",
["transaction_id"],
unique=False,
) )
op.create_index(op.f('ix_person_version_end_transaction_id'), 'person_version', ['end_transaction_id'], unique=False)
op.create_index(op.f('ix_person_version_operation_type'), 'person_version', ['operation_type'], unique=False)
op.create_index(op.f('ix_person_version_transaction_id'), 'person_version', ['transaction_id'], unique=False)
# user # user
op.create_table('user_version', op.create_table(
sa.Column('uuid', wuttjamaican.db.util.UUID(), autoincrement=False, nullable=False), "user_version",
sa.Column('username', sa.String(length=25), autoincrement=False, nullable=True), sa.Column(
sa.Column('password', sa.String(length=60), autoincrement=False, nullable=True), "uuid", wuttjamaican.db.util.UUID(), autoincrement=False, nullable=False
sa.Column('person_uuid', wuttjamaican.db.util.UUID(), autoincrement=False, nullable=True), ),
sa.Column('active', sa.Boolean(), autoincrement=False, nullable=True), sa.Column("username", sa.String(length=25), autoincrement=False, nullable=True),
sa.Column('transaction_id', sa.BigInteger(), autoincrement=False, nullable=False), sa.Column("password", sa.String(length=60), autoincrement=False, nullable=True),
sa.Column('end_transaction_id', sa.BigInteger(), nullable=True), sa.Column(
sa.Column('operation_type', sa.SmallInteger(), nullable=False), "person_uuid",
sa.PrimaryKeyConstraint('uuid', 'transaction_id', name=op.f('pk_user_version')) wuttjamaican.db.util.UUID(),
autoincrement=False,
nullable=True,
),
sa.Column("active", sa.Boolean(), autoincrement=False, nullable=True),
sa.Column(
"transaction_id", sa.BigInteger(), autoincrement=False, nullable=False
),
sa.Column("end_transaction_id", sa.BigInteger(), nullable=True),
sa.Column("operation_type", sa.SmallInteger(), nullable=False),
sa.PrimaryKeyConstraint("uuid", "transaction_id", name=op.f("pk_user_version")),
)
op.create_index(
op.f("ix_user_version_end_transaction_id"),
"user_version",
["end_transaction_id"],
unique=False,
)
op.create_index(
op.f("ix_user_version_operation_type"),
"user_version",
["operation_type"],
unique=False,
)
op.create_index(
op.f("ix_user_version_transaction_id"),
"user_version",
["transaction_id"],
unique=False,
) )
op.create_index(op.f('ix_user_version_end_transaction_id'), 'user_version', ['end_transaction_id'], unique=False)
op.create_index(op.f('ix_user_version_operation_type'), 'user_version', ['operation_type'], unique=False)
op.create_index(op.f('ix_user_version_transaction_id'), 'user_version', ['transaction_id'], unique=False)
# role # role
op.create_table('role_version', op.create_table(
sa.Column('uuid', wuttjamaican.db.util.UUID(), autoincrement=False, nullable=False), "role_version",
sa.Column('name', sa.String(length=100), autoincrement=False, nullable=True), sa.Column(
sa.Column('notes', sa.Text(), autoincrement=False, nullable=True), "uuid", wuttjamaican.db.util.UUID(), autoincrement=False, nullable=False
sa.Column('transaction_id', sa.BigInteger(), autoincrement=False, nullable=False), ),
sa.Column('end_transaction_id', sa.BigInteger(), nullable=True), sa.Column("name", sa.String(length=100), autoincrement=False, nullable=True),
sa.Column('operation_type', sa.SmallInteger(), nullable=False), sa.Column("notes", sa.Text(), autoincrement=False, nullable=True),
sa.PrimaryKeyConstraint('uuid', 'transaction_id', name=op.f('pk_role_version')) sa.Column(
"transaction_id", sa.BigInteger(), autoincrement=False, nullable=False
),
sa.Column("end_transaction_id", sa.BigInteger(), nullable=True),
sa.Column("operation_type", sa.SmallInteger(), nullable=False),
sa.PrimaryKeyConstraint("uuid", "transaction_id", name=op.f("pk_role_version")),
)
op.create_index(
op.f("ix_role_version_end_transaction_id"),
"role_version",
["end_transaction_id"],
unique=False,
)
op.create_index(
op.f("ix_role_version_operation_type"),
"role_version",
["operation_type"],
unique=False,
)
op.create_index(
op.f("ix_role_version_transaction_id"),
"role_version",
["transaction_id"],
unique=False,
) )
op.create_index(op.f('ix_role_version_end_transaction_id'), 'role_version', ['end_transaction_id'], unique=False)
op.create_index(op.f('ix_role_version_operation_type'), 'role_version', ['operation_type'], unique=False)
op.create_index(op.f('ix_role_version_transaction_id'), 'role_version', ['transaction_id'], unique=False)
# user_x_role # user_x_role
op.create_table('user_x_role_version', op.create_table(
sa.Column('uuid', wuttjamaican.db.util.UUID(), autoincrement=False, nullable=False), "user_x_role_version",
sa.Column('user_uuid', wuttjamaican.db.util.UUID(), autoincrement=False, nullable=True), sa.Column(
sa.Column('role_uuid', wuttjamaican.db.util.UUID(), autoincrement=False, nullable=True), "uuid", wuttjamaican.db.util.UUID(), autoincrement=False, nullable=False
sa.Column('transaction_id', sa.BigInteger(), autoincrement=False, nullable=False), ),
sa.Column('end_transaction_id', sa.BigInteger(), nullable=True), sa.Column(
sa.Column('operation_type', sa.SmallInteger(), nullable=False), "user_uuid", wuttjamaican.db.util.UUID(), autoincrement=False, nullable=True
sa.PrimaryKeyConstraint('uuid', 'transaction_id', name=op.f('pk_user_x_role_version')) ),
sa.Column(
"role_uuid", wuttjamaican.db.util.UUID(), autoincrement=False, nullable=True
),
sa.Column(
"transaction_id", sa.BigInteger(), autoincrement=False, nullable=False
),
sa.Column("end_transaction_id", sa.BigInteger(), nullable=True),
sa.Column("operation_type", sa.SmallInteger(), nullable=False),
sa.PrimaryKeyConstraint(
"uuid", "transaction_id", name=op.f("pk_user_x_role_version")
),
)
op.create_index(
op.f("ix_user_x_role_version_end_transaction_id"),
"user_x_role_version",
["end_transaction_id"],
unique=False,
)
op.create_index(
op.f("ix_user_x_role_version_operation_type"),
"user_x_role_version",
["operation_type"],
unique=False,
)
op.create_index(
op.f("ix_user_x_role_version_transaction_id"),
"user_x_role_version",
["transaction_id"],
unique=False,
) )
op.create_index(op.f('ix_user_x_role_version_end_transaction_id'), 'user_x_role_version', ['end_transaction_id'], unique=False)
op.create_index(op.f('ix_user_x_role_version_operation_type'), 'user_x_role_version', ['operation_type'], unique=False)
op.create_index(op.f('ix_user_x_role_version_transaction_id'), 'user_x_role_version', ['transaction_id'], unique=False)
# permission # permission
op.create_table('permission_version', op.create_table(
sa.Column('role_uuid', wuttjamaican.db.util.UUID(), autoincrement=False, nullable=False), "permission_version",
sa.Column('permission', sa.String(length=254), autoincrement=False, nullable=False), sa.Column(
sa.Column('transaction_id', sa.BigInteger(), autoincrement=False, nullable=False), "role_uuid",
sa.Column('end_transaction_id', sa.BigInteger(), nullable=True), wuttjamaican.db.util.UUID(),
sa.Column('operation_type', sa.SmallInteger(), nullable=False), autoincrement=False,
sa.PrimaryKeyConstraint('role_uuid', 'permission', 'transaction_id', name=op.f('pk_permission_version')) nullable=False,
),
sa.Column(
"permission", sa.String(length=254), autoincrement=False, nullable=False
),
sa.Column(
"transaction_id", sa.BigInteger(), autoincrement=False, nullable=False
),
sa.Column("end_transaction_id", sa.BigInteger(), nullable=True),
sa.Column("operation_type", sa.SmallInteger(), nullable=False),
sa.PrimaryKeyConstraint(
"role_uuid",
"permission",
"transaction_id",
name=op.f("pk_permission_version"),
),
)
op.create_index(
op.f("ix_permission_version_end_transaction_id"),
"permission_version",
["end_transaction_id"],
unique=False,
)
op.create_index(
op.f("ix_permission_version_operation_type"),
"permission_version",
["operation_type"],
unique=False,
)
op.create_index(
op.f("ix_permission_version_transaction_id"),
"permission_version",
["transaction_id"],
unique=False,
) )
op.create_index(op.f('ix_permission_version_end_transaction_id'), 'permission_version', ['end_transaction_id'], unique=False)
op.create_index(op.f('ix_permission_version_operation_type'), 'permission_version', ['operation_type'], unique=False)
op.create_index(op.f('ix_permission_version_transaction_id'), 'permission_version', ['transaction_id'], unique=False)
def downgrade() -> None: def downgrade() -> None:
# permission # permission
op.drop_index(op.f('ix_permission_version_transaction_id'), table_name='permission_version') op.drop_index(
op.drop_index(op.f('ix_permission_version_operation_type'), table_name='permission_version') op.f("ix_permission_version_transaction_id"), table_name="permission_version"
op.drop_index(op.f('ix_permission_version_end_transaction_id'), table_name='permission_version') )
op.drop_table('permission_version') op.drop_index(
op.f("ix_permission_version_operation_type"), table_name="permission_version"
)
op.drop_index(
op.f("ix_permission_version_end_transaction_id"),
table_name="permission_version",
)
op.drop_table("permission_version")
# user_x_role # user_x_role
op.drop_index(op.f('ix_user_x_role_version_transaction_id'), table_name='user_x_role_version') op.drop_index(
op.drop_index(op.f('ix_user_x_role_version_operation_type'), table_name='user_x_role_version') op.f("ix_user_x_role_version_transaction_id"), table_name="user_x_role_version"
op.drop_index(op.f('ix_user_x_role_version_end_transaction_id'), table_name='user_x_role_version') )
op.drop_table('user_x_role_version') op.drop_index(
op.f("ix_user_x_role_version_operation_type"), table_name="user_x_role_version"
)
op.drop_index(
op.f("ix_user_x_role_version_end_transaction_id"),
table_name="user_x_role_version",
)
op.drop_table("user_x_role_version")
# role # role
op.drop_index(op.f('ix_role_version_transaction_id'), table_name='role_version') op.drop_index(op.f("ix_role_version_transaction_id"), table_name="role_version")
op.drop_index(op.f('ix_role_version_operation_type'), table_name='role_version') op.drop_index(op.f("ix_role_version_operation_type"), table_name="role_version")
op.drop_index(op.f('ix_role_version_end_transaction_id'), table_name='role_version') op.drop_index(op.f("ix_role_version_end_transaction_id"), table_name="role_version")
op.drop_table('role_version') op.drop_table("role_version")
# user # user
op.drop_index(op.f('ix_user_version_transaction_id'), table_name='user_version') op.drop_index(op.f("ix_user_version_transaction_id"), table_name="user_version")
op.drop_index(op.f('ix_user_version_operation_type'), table_name='user_version') op.drop_index(op.f("ix_user_version_operation_type"), table_name="user_version")
op.drop_index(op.f('ix_user_version_end_transaction_id'), table_name='user_version') op.drop_index(op.f("ix_user_version_end_transaction_id"), table_name="user_version")
op.drop_table('user_version') op.drop_table("user_version")
# person # person
op.drop_index(op.f('ix_person_version_transaction_id'), table_name='person_version') op.drop_index(op.f("ix_person_version_transaction_id"), table_name="person_version")
op.drop_index(op.f('ix_person_version_operation_type'), table_name='person_version') op.drop_index(op.f("ix_person_version_operation_type"), table_name="person_version")
op.drop_index(op.f('ix_person_version_end_transaction_id'), table_name='person_version') op.drop_index(
op.drop_table('person_version') op.f("ix_person_version_end_transaction_id"), table_name="person_version"
)
op.drop_table("person_version")
# transaction # transaction
op.drop_index(op.f('ix_transaction_user_id'), table_name='transaction') op.drop_index(op.f("ix_transaction_user_id"), table_name="transaction")
op.drop_table('transaction') op.drop_table("transaction")

View file

@ -15,10 +15,10 @@ def release(c, skip_tests=False):
Release a new version of Wutta-Continuum Release a new version of Wutta-Continuum
""" """
if not skip_tests: if not skip_tests:
c.run('pytest') c.run("pytest")
if os.path.exists('dist'): if os.path.exists("dist"):
shutil.rmtree('dist') shutil.rmtree("dist")
c.run('python -m build --sdist') c.run("python -m build --sdist")
c.run('twine upload dist/*') c.run("twine upload dist/*")

View file

@ -17,5 +17,5 @@ class TestWuttaContinuumAppProvider(DataTestCase):
self.assertFalse(provider.continuum_is_enabled()) self.assertFalse(provider.continuum_is_enabled())
# but can be turned on # but can be turned on
self.config.setdefault('wutta_continuum.enable_versioning', 'true') self.config.setdefault("wutta_continuum.enable_versioning", "true")
self.assertTrue(provider.continuum_is_enabled()) self.assertTrue(provider.continuum_is_enabled())

View file

@ -17,8 +17,8 @@ class TestWuttaContinuumConfigExtension(DataTestCase):
def test_startup(self): def test_startup(self):
ext = self.make_extension() ext = self.make_extension()
with patch.object(mod, 'make_versioned') as make_versioned: with patch.object(mod, "make_versioned") as make_versioned:
with patch.object(mod, 'configure_mappers') as configure_mappers: with patch.object(mod, "configure_mappers") as configure_mappers:
# nothing happens by default # nothing happens by default
ext.startup(self.config) ext.startup(self.config)
@ -26,7 +26,7 @@ class TestWuttaContinuumConfigExtension(DataTestCase):
configure_mappers.assert_not_called() configure_mappers.assert_not_called()
# but will if we enable it in config # but will if we enable it in config
self.config.setdefault('wutta_continuum.enable_versioning', 'true') self.config.setdefault("wutta_continuum.enable_versioning", "true")
ext.startup(self.config) ext.startup(self.config)
make_versioned.assert_called_once() make_versioned.assert_called_once()
configure_mappers.assert_called_once_with() configure_mappers.assert_called_once_with()
@ -39,8 +39,8 @@ class TestWuttaContinuumPlugin(DataTestCase):
def test_remote_addr(self): def test_remote_addr(self):
plugin = self.make_plugin() plugin = self.make_plugin()
with patch.object(socket, 'gethostbyname', return_value='127.0.0.1'): with patch.object(socket, "gethostbyname", return_value="127.0.0.1"):
self.assertEqual(plugin.get_remote_addr(None, self.session), '127.0.0.1') self.assertEqual(plugin.get_remote_addr(None, self.session), "127.0.0.1")
def test_user_id(self): def test_user_id(self):
plugin = self.make_plugin() plugin = self.make_plugin()
@ -48,11 +48,14 @@ class TestWuttaContinuumPlugin(DataTestCase):
def test_transaction_args(self): def test_transaction_args(self):
plugin = self.make_plugin() plugin = self.make_plugin()
with patch.object(socket, 'gethostbyname', return_value='127.0.0.1'): with patch.object(socket, "gethostbyname", return_value="127.0.0.1"):
self.assertEqual(plugin.transaction_args(None, self.session), self.assertEqual(
{'remote_addr': '127.0.0.1'}) plugin.transaction_args(None, self.session),
{"remote_addr": "127.0.0.1"},
)
with patch.object(plugin, 'get_user_id', return_value='some-random-uuid'): with patch.object(plugin, "get_user_id", return_value="some-random-uuid"):
self.assertEqual(plugin.transaction_args(None, self.session), self.assertEqual(
{'remote_addr': '127.0.0.1', plugin.transaction_args(None, self.session),
'user_id': 'some-random-uuid'}) {"remote_addr": "127.0.0.1", "user_id": "some-random-uuid"},
)