allow additional settings in the crate_layer factory fixture

Author: chaudum

CHANGES.rst

@@ -5,6 +5,9 @@ Changelog for pytest-crate
 Unreleased
 ==========
 
+- Allow additional CrateDB settings in the ``crate_layer`` factory fixture
+  which are applied on node start.
+
 - Expose addresses of started CrateDB nodes
 
 2019/04/05 0.1.0

pytest_crate/plugin.py

@@ -19,12 +19,13 @@ class CrateLayer:
     crate_dir: str
     tmp: str
 
-    def __init__(self, name: str, version: str) -> None:
+    def __init__(self, name: str, version: str, **settings) -> None:
         self.name = name
         self.crate_dir = get_crate(version)
+        self.settings = settings
 
     def __repr__(self) -> str:
-        return self.name
+        return f"<CrateDB {self.name}>"
 
     def __enter__(self):
         self._start()
@@ -34,24 +35,26 @@ def __exit__(self, exception_type, exception_value, traceback):
         self._stop()
 
     def _start(self) -> None:
-        print(f"Starting CrateDB {self} ...")
+        print(f"Starting {self} ...")
         self.tmp = tempfile.mkdtemp()
         settings = {
             "cluster.name": self.name,
+            "node.name": f"{self.name}-0",
             "path.data": self.tmp,
         }
+        settings.update(self.settings)
         env = {"CRATE_HOME": self.crate_dir}
         self.node = CrateNode(
             crate_dir=self.crate_dir, keep_data=False, settings=settings, env=env
         )
         self.node.start()
-        print(f"CrateDB {self} started")
+        print(f"{self} started")
 
     def _stop(self) -> None:
-        print(f"Stopping CrateDB {self} ...")
+        print(f"Stopping {self} ...")
         self.node.stop()
         shutil.rmtree(self.tmp, ignore_errors=True)
-        print(f"CrateDB {self} stopped")
+        print(f"{self} stopped")
 
     def dsn(self) -> str:
         return self.node.http_url
@@ -92,8 +95,8 @@ def crate_version(self, pytestconfig) -> Generator[str, None, None]:
 
     @pytest.fixture(scope="session")
     def crate_layer(self) -> CrateLayerFactoryGenerator:
-        def layer_factory(name: str, version: str):
-            with CrateLayer(name, version) as layer:
+        def layer_factory(name: str, version: str, **settings):
+            with CrateLayer(name, version, **settings) as layer:
                 yield layer
         yield layer_factory
 

tests/test_layer.py

@@ -1,4 +1,5 @@
 import pytest
+from crate.client import connect
 
 
 @pytest.fixture(scope="session")
@@ -7,8 +8,11 @@ def custom_crate_a(crate_layer):
 
 
 @pytest.fixture(scope="session")
-def custom_crate_b(crate_layer):
-    yield from crate_layer("crate_b", "3.2.x")
+def custom_crate_b(crate_layer, crate_version):
+    settings = {
+        "node.name": "custom-node-name",
+    }
+    yield from crate_layer("crate_b", crate_version, **settings)
 
 
 def test_crate(crate):
@@ -40,6 +44,21 @@ def test_execute(crate_execute, crate_cursor):
     assert crate_cursor.fetchall() == [["test_execute", 1]]
 
 
-def test_custom_crate(custom_crate_a, custom_crate_b):
+def test_custom_crates(custom_crate_a, custom_crate_b):
     assert custom_crate_a.name == "crate_a"
     assert custom_crate_b.name == "crate_b"
+
+
+def test_crate_with_custom_settings(custom_crate_b):
+    assert custom_crate_b.name == "crate_b"
+    assert custom_crate_b.settings == {
+        "node.name": "custom-node-name",
+    }
+    with connect(custom_crate_b.dsn()) as conn:
+        cursor = conn.cursor()
+        for stmt, expected in [
+                ["SELECT name FROM sys.cluster", ["crate_b"]],
+                ["SELECT name FROM sys.nodes", ["custom-node-name"]],
+        ]:
+            cursor.execute(stmt)
+            assert cursor.fetchone() == expected