Skip to content

Commit 690d5c5

Browse files
committed
rename config.check_consistency() to config.validate_schema()
1 parent bf20c3e commit 690d5c5

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

doc/api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Finding
9292
Import and export
9393
"""""""""""""""""
9494

95-
.. automethod:: tmuxp.config.check_consistency
95+
.. automethod:: tmuxp.config.validate_schema
9696

9797
.. automethod:: tmuxp.config.expand
9898

tmuxp/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
logger = logging.getLogger(__name__)
1919

2020

21-
def check_consistency(sconf):
21+
def validate_schema(sconf):
2222
"""Return True if config schema is correct.
2323
2424
:param sconf: session configuration

tmuxp/testsuite/test_config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ def test_no_session_name(self):
744744
sconfig = sconfig.import_config(yaml_config).get()
745745

746746
with self.assertRaisesRegexp(exc.ConfigError, 'requires "session_name"'):
747-
config.check_consistency(sconfig)
747+
config.validate_schema(sconfig)
748748

749749
def test_no_windows(self):
750750
yaml_config = '''
@@ -755,7 +755,7 @@ def test_no_windows(self):
755755
sconfig = sconfig.import_config(yaml_config).get()
756756

757757
with self.assertRaisesRegexp(exc.ConfigError, 'list of "windows"'):
758-
config.check_consistency(sconfig)
758+
config.validate_schema(sconfig)
759759

760760
def test_no_window_name(self):
761761
yaml_config = '''
@@ -776,7 +776,7 @@ def test_no_window_name(self):
776776
sconfig = sconfig.import_config(yaml_config).get()
777777

778778
with self.assertRaisesRegexp(exc.ConfigError, 'missing "window_name"'):
779-
config.check_consistency(sconfig)
779+
config.validate_schema(sconfig)
780780

781781

782782
if __name__ == '__main__':

tmuxp/testsuite/test_config_teamocil.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def test_config_to_dict(self):
7777
self.tmuxp_dict
7878
)
7979

80-
config.check_consistency(
80+
config.validate_schema(
8181
config.import_teamocil(
8282
self.teamocil_dict
8383
)
@@ -86,7 +86,7 @@ def test_config_to_dict(self):
8686
def test_config_to_yaml(self):
8787
'''teamocil yaml to tmuxp yaml config
8888
89-
use check_consistency to assert against
89+
use validate_schema to assert against
9090
'''
9191
pass
9292

@@ -154,7 +154,7 @@ def test_config_to_dict(self):
154154
self.tmuxp_dict
155155
)
156156

157-
config.check_consistency(
157+
config.validate_schema(
158158
config.import_teamocil(
159159
self.teamocil_dict
160160
)
@@ -241,7 +241,7 @@ def test_config_to_dict(self):
241241
self.tmuxp_dict
242242
)
243243

244-
config.check_consistency(
244+
config.validate_schema(
245245
config.import_teamocil(
246246
self.teamocil_dict
247247
)
@@ -294,7 +294,7 @@ def test_config_to_dict(self):
294294
self.tmuxp_dict
295295
)
296296

297-
config.check_consistency(
297+
config.validate_schema(
298298
config.import_teamocil(
299299
self.teamocil_dict
300300
)
@@ -669,7 +669,7 @@ def test_config_to_dict(self):
669669
self.two_windows
670670
)
671671

672-
config.check_consistency(
672+
config.validate_schema(
673673
config.import_teamocil(
674674
self.teamocil_dict['two-windows']
675675
)
@@ -682,7 +682,7 @@ def test_config_to_dict(self):
682682
self.two_windows_with_filters
683683
)
684684

685-
config.check_consistency(
685+
config.validate_schema(
686686
config.import_teamocil(
687687
self.teamocil_dict['two-windows-with-filters']
688688
)
@@ -695,7 +695,7 @@ def test_config_to_dict(self):
695695
self.two_windows_with_custom_command_options
696696
)
697697

698-
config.check_consistency(
698+
config.validate_schema(
699699
config.import_teamocil(
700700
self.teamocil_dict['two-windows-with-custom-command-options']
701701
)
@@ -707,7 +707,7 @@ def test_config_to_dict(self):
707707
),
708708
self.three_windows_within_a_session
709709
)
710-
config.check_consistency(
710+
config.validate_schema(
711711
config.import_teamocil(
712712
self.teamocil_dict['three-windows-within-a-session']
713713
)

tmuxp/testsuite/test_workspacefreezer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def test_freeze_config(self):
6161
session = self.session
6262
sconf = freeze(session)
6363

64-
config.check_consistency(sconf)
64+
config.validate_schema(sconf)
6565

6666
sconf = config.inline(sconf)
6767

0 commit comments

Comments
 (0)