HK: Tidying and minor fixes.

Author: Poogles

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pytest-bq"
-version = "0.0.3"
+version = "0.0.4"
 description = "BigQuery fixtures and fixture factories for Pytest."
 readme = "README.md"
 keywords = ["tests", "pytest", "fixture", "bq"]

pytest_bq/__init__.py

@@ -1,2 +1,3 @@
 """pytest-bq plugin."""
-__version__ = "0.0.3"
+
+__version__ = "0.0.4"

pytest_bq/executor/__init__.py

@@ -1,2 +1,3 @@
 """Plugin executors."""
+
 from .process import BQExecutor  # noqa

pytest_bq/executor/process.py

@@ -2,6 +2,7 @@
 
 Starts a local BQ server using the targeted configuration.
 """
+
 from pathlib import Path
 from typing import List, Optional
 
@@ -17,15 +18,20 @@ def __init__(
         project_id: str,
         port: int,
         grpc_port: int,
+        database_file_path: Path,
         data_from_yaml: Optional[str] = None,
         loglevel: Optional[str] = None,
     ) -> None:
         """Start up local BQ.
 
         Args:
             executable: executable to call.
-            host: host address fixture will be started on.
-            port: port fixture will listen on.
+            project_id: google project ID to start local emulator with
+            port: api port fixture will listen on.
+            grpc_port: port storage api fixture will listen on.
+
+        Kwargs:
+            database_file_path: bigquery-emulator config file path.
             loglevel: log level passed to `fake-BQ-server` binary.
 
         Returns:
@@ -39,6 +45,8 @@ def __init__(
             str(port),
             "--grpc-port",
             str(grpc_port),
+            "--database",
+            str(database_file_path),
         ]
 
         if loglevel:
@@ -49,12 +57,17 @@ def __init__(
             command.extend(["--data-from-yaml", data_from_yaml])
 
         self._project_id = project_id
+        self._port = port
+        self._grpc_port = grpc_port
         self._starting_command = command
         self.executable = executable
 
         super().__init__(
             # TODO: Figure out why this returns a 500?
-            command, url=f"http://localhost:{port}/bigquery/v2/projects", timeout=5, status="500"
+            command,
+            url=f"http://localhost:{port}/bigquery/v2/projects",
+            timeout=5,
+            status="500",
         )
 
     def start(self) -> "BQExecutor":
@@ -64,5 +77,15 @@ def start(self) -> "BQExecutor":
 
     @property
     def project_id(self) -> str:
-        """Return the configured project_id the emulator is running under."""
+        """Configured project_id the emulator is running under."""
         return self._project_id
+
+    @property
+    def bq_api_port(self) -> int:
+        """Configured port the bigquery api emulator is running on."""
+        return self._port
+
+    @property
+    def storage_api_port(self) -> int:
+        """Configured port the storage api is running under."""
+        return self._grpc_port

pytest_bq/factories/proc.py

@@ -1,4 +1,6 @@
 """bq process factory."""
+
+import logging
 from pathlib import Path
 from typing import Callable, Generator, Optional
 
@@ -10,6 +12,8 @@
 from pytest_bq.config import get_config
 from pytest_bq.executor import BQExecutor
 
+log = logging.getLogger(__name__)
+
 
 def bq_proc(
     executable: Optional[str] = None,
@@ -47,22 +51,26 @@ def bq_proc_fixture(
         bq_project_id = project_id or config["project_id"]
         assert bq_project_id, "Project ID is required."
 
-        bq_port = (
-            get_port(port) if port else get_port(config["port"]) or get_port(None)
-        )
+        bq_port = get_port(port) if port else get_port(config["port"]) or get_port(None)
         assert bq_port, "Unable to find a port available."
         bq_grpc_port = (
-            get_port(grpc_port) if grpc_port else get_port(config["grpc_port"]) or get_port(None)
+            get_port(grpc_port)
+            if grpc_port
+            else get_port(config["grpc_port"]) or get_port(None)
         )
         assert bq_grpc_port, "Unable to find a port available."
 
+        database_file = Path(tmp_path_factory.mktemp("db")) / "sqllite.db"
+        log.debug("Using sqllite db at path %r", database_file)
+
         bq_executor = BQExecutor(
             executable=Path(bq_exec),
             project_id=bq_project_id,
             data_from_yaml=data_from_yaml,
             port=bq_port,
             grpc_port=bq_grpc_port,
             loglevel=loglevel or config["loglevel"],
+            database_file_path=database_file,
         )
         with bq_executor:
             yield bq_executor

pytest_bq/plugin.py

@@ -1,4 +1,5 @@
 """pytest-bq plugin declaration."""
+
 from shutil import which
 
 from pytest import Parser
@@ -20,9 +21,7 @@
 
 def pytest_addoption(parser: Parser) -> None:
     """Plugin configuration options."""
-    parser.addini(
-        name="bq_executable", help=_HELP_EXEC, default=which("bigquery")
-    )
+    parser.addini(name="bq_executable", help=_HELP_EXEC, default=which("bigquery"))
     parser.addini(name="bq_port", help=_HELP_PORT)
     parser.addini(name="bq_grpc_port", help=_HELP_GRPC_PORT)
     parser.addini(name="bq_loglevel", help=_HELP_LOGLEVEL)
@@ -33,13 +32,18 @@ def pytest_addoption(parser: Parser) -> None:
         "--bq-executable", action="store", dest="bq_executable", help=_HELP_EXEC
     )
     parser.addoption("--bq-port", action="store", dest="bq_port", help=_HELP_PORT)
-    parser.addoption("--bq-grpc-port", action="store", dest="bq_grpc_port", help=_HELP_GRPC_PORT)
+    parser.addoption(
+        "--bq-grpc-port", action="store", dest="bq_grpc_port", help=_HELP_GRPC_PORT
+    )
     parser.addoption(
         "--bq-loglevel", action="store", dest="bq_loglevel", help=_HELP_LOGLEVEL
     )
     parser.addoption(
         "--bq-project-id", action="store", dest="bq_project_id", help=_HELP_PROJECT_ID
     )
     parser.addoption(
-        "--bq-data-from-yaml", action="store", dest="bq_data_from_yaml", help=_HELP_DATA_FROM_YAML
+        "--bq-data-from-yaml",
+        action="store",
+        dest="bq_data_from_yaml",
+        help=_HELP_DATA_FROM_YAML,
     )

tests/conftest.py

@@ -1,4 +1,5 @@
 """Tests main conftest file."""
+
 import subprocess
 import warnings
 
@@ -11,15 +12,21 @@
     module="(_pytest|pytest|google|path|mirakuru).*",
 )
 executable_path = (
-    subprocess.run("which bigquery-emulator", capture_output=True, shell=True).stdout
-    .decode()
-    .strip('\n')
+    subprocess.run("which bigquery-emulator", capture_output=True, shell=True)
+    .stdout.decode()
+    .strip("\n")
 )
 
 
-bq_proc = pytest_bq.factories.proc.bq_proc(executable=executable_path, project_id='test-base')
+bq_proc = pytest_bq.factories.proc.bq_proc(
+    executable=executable_path, project_id="test-base"
+)
 bqlocal = pytest_bq.factories.client.bqlocal("bq_proc")
 
 
-bq_proc1 = pytest_bq.factories.proc.bq_proc(executable=executable_path, project_id='test-data', data_from_yaml='./tests/resources/test_data.yaml')
+bq_proc1 = pytest_bq.factories.proc.bq_proc(
+    executable=executable_path,
+    project_id="test-data",
+    data_from_yaml="./tests/resources/test_data.yaml",
+)
 bqlocal1 = pytest_bq.factories.client.bqlocal("bq_proc1")

tests/test_bq.py

@@ -1,4 +1,5 @@
 """General plugin tests."""
+
 import pytest
 from google.cloud import bigquery
 
@@ -32,4 +33,4 @@ def test_can_load_test_data_yaml(bqlocal1: bigquery.Client) -> None:
         job_config=bigquery.QueryJobConfig(),
     )
     results = [x.values() for x in job.result()]
-    assert results == [(1, ), (2, )]
+    assert results == [(1,), (2,)]