Skip to content

Tests imports refactoring #23

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

Open
michaelr-sqream wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Tests imports refactoring #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85f0e98
fix: resolve tests imports problem
michaelr-sqream Sep 30, 2024
b43dda5
fix: resolve import `Operations` from `alembic`
michaelr-sqream Sep 30, 2024
3b85e2e
remove: less comment
michaelr-sqream Oct 1, 2024
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 setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
python_requires = '>=3.9',

install_requires = ['sqlalchemy==2.0.27',
'pysqream==3.2.5',
'pysqream>=3.2.5',
'setuptools>=57.4.0',
'pandas==2.2.1',
'numpy>=1.20',
Expand Down
Empty file added tests/__init__.py
View file
Open in desktop
Empty file.
110 changes: 57 additions & 53 deletions tests/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
import socket
from datetime import datetime, date
from datetime import date, datetime
from decimal import Decimal
from random import choice, randint, choices
from random import choice, choices, randint
from typing import Union

import pytest
import sqlalchemy as sa
from sqlalchemy import (text,
Table,
Column,
orm,
Integer,
Boolean,
Date,
DateTime,
Numeric,
Text,
create_engine,
MetaData,
Identity,
Connection)
from sqlalchemy.orm import declarative_base, Session

from pytest_logger import Logger
from sqlalchemy import (
Boolean,
Column,
Connection,
Date,
DateTime,
Identity,
Integer,
MetaData,
Numeric,
Table,
Text,
create_engine,
orm,
text,
)
from sqlalchemy.dialects import registry
from sqlalchemy.orm import Session, declarative_base

from tests.pytest_logger import Logger


def connect(ip, port, clustered=False, use_ssl=False):
print_echo = False
conn_str = f"pysqream+dialect://sqream:sqream@{ip}:{port}/master"
registry.register("pysqream.dialect", "pysqream_sqlalchemy.dialect", "SqreamDialect")
engine = create_engine(conn_str, echo=print_echo, connect_args={"clustered": clustered, "use_ssl": use_ssl})
sa.Tinyint = engine.dialect.Tinyint
session = orm.sessionmaker(bind=engine)()
Expand All @@ -41,11 +45,11 @@ def setTinyint(engine):


class TestBase:
@pytest.fixture()
@pytest.fixture
def ip(self, pytestconfig):
return pytestconfig.getoption("ip")

@pytest.fixture()
@pytest.fixture
def port(self, pytestconfig):
return pytestconfig.getoption("port")

Expand All @@ -71,35 +75,35 @@ def stop(self):


class TestBaseOrm(TestBase):
@pytest.fixture()
@pytest.fixture
def ip(self, pytestconfig):
return pytestconfig.getoption("ip")

@pytest.fixture()
def port(self, pytestconfig):
return pytestconfig.getoption("port")

@pytest.fixture()
@pytest.fixture
def Base(self, pytestconfig):
return self.Base

@pytest.fixture()
@pytest.fixture
def user(self):
return self.user

@pytest.fixture()
@pytest.fixture
def address(self):
return self.address

@pytest.fixture()
@pytest.fixture
def dates(self):
return self.dates

@pytest.fixture()
@pytest.fixture
def table1(self):
return self.table1

@pytest.fixture()
@pytest.fixture
def table2(self):
return self.table2

Expand Down Expand Up @@ -143,25 +147,25 @@ def __repr__(self):
self.start(ip, port)

self.table1 = Table(
'table1', self.metadata,
Column("id", sa.Integer), Column("name", sa.UnicodeText), Column("value", sa.Integer)
"table1", self.metadata,
Column("id", sa.Integer), Column("name", sa.UnicodeText), Column("value", sa.Integer),
)

self.table2 = Table(
'table2', self.metadata,
Column("id", sa.Integer), Column("name", sa.UnicodeText), Column("value", sa.Integer)
"table2", self.metadata,
Column("id", sa.Integer), Column("name", sa.UnicodeText), Column("value", sa.Integer),
)

yield
self.stop()


class TestBaseTI(TestBase):
@pytest.fixture()
@pytest.fixture
def ip(self, pytestconfig):
return pytestconfig.getoption("ip")

@pytest.fixture()
@pytest.fixture
def testware_affinity_matrix(self):
return self.testware_affinity_matrix

Expand All @@ -170,17 +174,17 @@ def Test_setup_teardown(self, ip, port):
self.start(ip, port)

self.testware_affinity_matrix = sa.Table(
'testware_affinity_matrix',
"testware_affinity_matrix",
self.metadata,
sa.Column('technology', sa.TEXT(32)),
sa.Column('criteria', sa.TEXT(32)),
sa.Column('category', sa.TEXT(32)),
sa.Column('component', sa.TEXT(32)),
sa.Column('svn', sa.TEXT(32)),
sa.Column('parm_name', sa.TEXT(32)),
sa.Column('lpt', sa.TEXT(32)),
sa.Column('tech', sa.TEXT(32)),
sa.Column('severity', sa.Float)
sa.Column("technology", sa.TEXT(32)),
sa.Column("criteria", sa.TEXT(32)),
sa.Column("category", sa.TEXT(32)),
sa.Column("component", sa.TEXT(32)),
sa.Column("svn", sa.TEXT(32)),
sa.Column("parm_name", sa.TEXT(32)),
sa.Column("lpt", sa.TEXT(32)),
sa.Column("tech", sa.TEXT(32)),
sa.Column("severity", sa.Float),
)

if self.insp.has_table(self.testware_affinity_matrix.name):
Expand All @@ -193,7 +197,7 @@ def Test_setup_teardown(self, ip, port):


class TestBaseCRUD(TestBase):
database_name = schema_name = table_name = 'crud'
database_name = schema_name = table_name = "crud"
view_name = "view_for_crud"

@staticmethod
Expand Down Expand Up @@ -228,19 +232,19 @@ def crud_table(self):
return Table(
self.table_name,
self.metadata,
Column('i', Integer),
Column('b', Boolean),
Column('d', Date),
Column('dt', DateTime),
Column('n', Numeric(15, 6)),
Column('t', Text),
Column("i", Integer),
Column("b", Boolean),
Column("d", Date),
Column("dt", DateTime),
Column("n", Numeric(15, 6)),
Column("t", Text),
# Column('iar', ARRAY(Integer)),
# Column('bar', ARRAY(Boolean)),
# Column('dar', ARRAY(Date)),
# Column('dtar',ARRAY(DateTime)),
# Column('nar', ARRAY(Numeric(15, 6))),
# Column('tar', ARRAY(Text)),
extend_existing=True
extend_existing=True,
)

@staticmethod
Expand All @@ -256,7 +260,7 @@ def get_random_row_values_for_crud_table(row_number: int):
minute=randint(1, 59),
second=randint(1, 59)),
Decimal(f"{randint(int(1e8), int(9e8))}.{randint(int(1e5), int(9e5))}"),
"".join(choices("ABCDEFGHIJKLMNOPQRSTUVWXYZ", k=randint(5, 50)))
"".join(choices("ABCDEFGHIJKLMNOPQRSTUVWXYZ", k=randint(5, 50))),
)

def recreate_all_via_metadata(self, executor: Union[Connection, Session] = None):
Expand Down
Loading