Skip to content

Modify JSON Tests to allow connection to external server. #70

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

Merged
roshkhatri merged 2 commits into from
Aug 12, 2025
Merged

Modify JSON Tests to allow connection to external server. #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c05d82a
Adding files
Nikhil-Manglore Aug 4, 2025
90dddd2
Removing logging statements
Nikhil-Manglore Aug 5, 2025
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
38 changes: 33 additions & 5 deletions tst/integration/json_test_case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,22 @@ class SimpleTestCase(ValkeyTestCase):
'''
@pytest.fixture(autouse=True)
def setup_test(self, setup):
server_path = f"{os.path.dirname(os.path.realpath(__file__))}/.build/binaries/{os.environ['SERVER_VERSION']}/valkey-server"
self.server, self.client = self.create_server(testdir = self.testdir, server_path=server_path)
use_external = os.environ.get("VALKEY_EXTERNAL_SERVER", "false").lower() == "true"

if use_external:
# Use external server
external_host = os.environ.get("VALKEY_HOST", "localhost")
external_port = int(os.environ.get("VALKEY_PORT", "6379"))
self.server, self.client = self.create_server(
testdir=self.testdir,
bind_ip=external_host,
port=external_port,
external_server=True
)
else:
# Original local server
server_path = f"{os.path.dirname(os.path.realpath(__file__))}/.build/binaries/{os.environ['SERVER_VERSION']}/valkey-server"
self.server, self.client = self.create_server(testdir=self.testdir, server_path=server_path)

def teardown(self):
if self.is_connected():
Expand Down Expand Up @@ -47,9 +61,23 @@ def verify_error_response(self, client, cmd, expected_err_reply):

@pytest.fixture(autouse=True)
def setup_test(self, setup):
server_path = f"{os.path.dirname(os.path.realpath(__file__))}/.build/binaries/{os.environ['SERVER_VERSION']}/valkey-server"
args = {'loadmodule': os.getenv('MODULE_PATH'), "enable-debug-command": "local", 'enable-protected-configs': 'yes'}
self.server, self.client = self.create_server(testdir = self.testdir, server_path=server_path, args=args)
use_external = os.environ.get("VALKEY_EXTERNAL_SERVER", "false").lower() == "true"

if use_external:
# Use external server
external_host = os.environ.get("VALKEY_HOST", "localhost")
external_port = int(os.environ.get("VALKEY_PORT", "6379"))
self.server, self.client = self.create_server(
testdir=self.testdir,
bind_ip=external_host,
port=external_port,
external_server=True
)
else:
# Original local server
server_path = f"{os.path.dirname(os.path.realpath(__file__))}/.build/binaries/{os.environ['SERVER_VERSION']}/valkey-server"
args = {'loadmodule': os.getenv('MODULE_PATH'), "enable-debug-command": "local", 'enable-protected-configs': 'yes'}
self.server, self.client = self.create_server(testdir=self.testdir, server_path=server_path, args=args)

self.error_class = ErrorStringTester

Expand Down
21 changes: 18 additions & 3 deletions tst/integration/test_json_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,24 @@ def setup_data(self):

@pytest.fixture(autouse=True)
def setup_test(self, setup):
server_path = f"{os.path.dirname(os.path.realpath(__file__))}/.build/binaries/{os.environ['SERVER_VERSION']}/valkey-server"
args = {'loadmodule': os.getenv('MODULE_PATH'), "enable-debug-command": "local", 'enable-protected-configs': 'yes'}
self.server, self.client = self.create_server(testdir = self.testdir, server_path=server_path, args=args)
# Check if we should use external server
use_external = os.environ.get("VALKEY_EXTERNAL_SERVER", "false").lower() == "true"

if use_external:
# Use external server
external_host = os.environ.get("VALKEY_HOST", "localhost")
external_port = int(os.environ.get("VALKEY_PORT", "6379"))
self.server, self.client = self.create_server(
testdir=self.testdir,
bind_ip=external_host,
port=external_port,
external_server=True
)
else:
# Original local server setup
server_path = f"{os.path.dirname(os.path.realpath(__file__))}/.build/binaries/{os.environ['SERVER_VERSION']}/valkey-server"
args = {'loadmodule': os.getenv('MODULE_PATH'), "enable-debug-command": "local", 'enable-protected-configs': 'yes'}
self.server, self.client = self.create_server(testdir=self.testdir, server_path=server_path, args=args)

self.error_class = ErrorStringTester
self.setup_data()
Expand Down
23 changes: 19 additions & 4 deletions tst/integration/test_rdb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,25 @@ def setup_data(self):
'JSON.SET', 'store', '.', self.data_store)

@pytest.fixture(autouse=True)
def setup_test(self):
server_path = f"{os.path.dirname(os.path.realpath(__file__))}/.build/binaries/{os.environ['SERVER_VERSION']}/valkey-server"
args = {'loadmodule': os.getenv('MODULE_PATH'), "enable-debug-command": "local", 'enable-protected-configs': 'yes'}
self.server, self.client = self.create_server(testdir = self.testdir, server_path=server_path, args=args)
def setup_test(self, setup):
# Check if we should use external server
use_external = os.environ.get("VALKEY_EXTERNAL_SERVER", "false").lower() == "true"

if use_external:
# Use external server
external_host = os.environ.get("VALKEY_HOST", "localhost")
external_port = int(os.environ.get("VALKEY_PORT", "6379"))
self.server, self.client = self.create_server(
testdir=self.testdir,
bind_ip=external_host,
port=external_port,
external_server=True
)
else:
# Original local server setup
server_path = f"{os.path.dirname(os.path.realpath(__file__))}/.build/binaries/{os.environ['SERVER_VERSION']}/valkey-server"
args = {'loadmodule': os.getenv('MODULE_PATH'), "enable-debug-command": "local", 'enable-protected-configs': 'yes'}
self.server, self.client = self.create_server(testdir=self.testdir, server_path=server_path, args=args)

self.error_class = ErrorStringTester
self.setup_data()
Expand Down