From 637da7719edc1026f53f70494f58dbe4ddfd4079 Mon Sep 17 00:00:00 2001
From: Konstantin Knizhnik <knizhnik@neon.tech>
Date: Sat, 19 Oct 2024 09:29:11 +0300
Subject: [PATCH] Add test for combination of physical and logical replication

---
 test_runner/regress/test_physical_and_logical_replicaiton.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test_runner/regress/test_physical_and_logical_replicaiton.py b/test_runner/regress/test_physical_and_logical_replicaiton.py
index ec14e08a14..d2b23c3c88 100644
--- a/test_runner/regress/test_physical_and_logical_replicaiton.py
+++ b/test_runner/regress/test_physical_and_logical_replicaiton.py
@@ -8,7 +8,11 @@ from fixtures.neon_fixtures import NeonEnv, logical_replication_sync
 def test_physical_and_logical_replication(neon_simple_env: NeonEnv, vanilla_pg):
     env = neon_simple_env
 
+<<<<<<< HEAD
     n_records = 100000
+=======
+    n_records = 1000000
+>>>>>>> 7fbb1d150 (Add test for combination of physical and logical replication)
 
     primary = env.endpoints.create_start(
         branch_name="main",