Skip to content
This repository was archived by the owner on Jan 4, 2024. It is now read-only.

Commit f171d43

Browse files
committed
Improved the startup validation
1 parent 841bd4d commit f171d43

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

js_host/base_server.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ def __init__(self, config_file=None, source_root=None, path_to_node=None):
6767
if not os.path.exists(self.get_path_to_config_file()):
6868
raise ConfigError('Config file {} does not exist'.format(self.get_path_to_config_file()))
6969

70+
self.validate_status()
71+
7072
def get_path_to_config_file(self):
7173
if os.path.isabs(self.config_file):
7274
return self.config_file
@@ -233,10 +235,6 @@ def validate_status(self):
233235
raise ConfigError('No port has been defined in {}'.format(config))
234236

235237
def connect(self):
236-
if not self.has_validated_status:
237-
self.validate_status()
238-
self.has_validated_status = True
239-
240238
if not self.is_running():
241239
raise ConnectionError('Cannot connect to {}'.format(self.get_name()))
242240

tests/test_base_server.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,10 @@ def test_raises_an_error_if_a_config_file_does_not_exist(self):
6464
)
6565

6666
def test_raises_an_error_if_a_config_file_does_not_export_an_object(self):
67-
server = self.BaseServerSubclass(
67+
self.assertRaises(
68+
ConfigError,
69+
self.BaseServerSubclass,
6870
path_to_node=settings.PATH_TO_NODE,
6971
source_root=settings.SOURCE_ROOT,
7072
config_file=empty_config_file,
71-
)
72-
self.assertRaises(ConfigError, server.validate_status)
73+
)

0 commit comments

Comments
 (0)