refactor(tests): _util -> utils

tony · tony · commit 302caa37405f · 2022-03-20T07:59:33.000-05:00
diff --git a/tests/fixtures/__init__.py b/tests/fixtures/__init__.py
@@ -1 +1 @@
-from . import _util  # noqa
+from . import utils  # noqa
diff --git a/tests/fixtures/config/expand2.py b/tests/fixtures/config/expand2.py
@@ -1,6 +1,6 @@
 import os
 
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 unexpanded_yaml = test_utils.read_config_file("config/expand2-unexpanded.yaml")
 expanded_yaml = test_utils.read_config_file("config/expand2-expanded.yaml").format(
diff --git a/tests/fixtures/config/shell_command_before_session.py b/tests/fixtures/config/shell_command_before_session.py
@@ -1,4 +1,4 @@
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 before = test_utils.read_config_file("config/shell_command_before_session.yaml")
 expected = test_utils.read_config_file(
diff --git a/tests/fixtures/config_teamocil/layouts.py b/tests/fixtures/config_teamocil/layouts.py
@@ -1,4 +1,4 @@
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 teamocil_yaml = test_utils.read_config_file("config_teamocil/layouts.yaml")
 
diff --git a/tests/fixtures/config_teamocil/test1.py b/tests/fixtures/config_teamocil/test1.py
@@ -1,4 +1,4 @@
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 teamocil_yaml = test_utils.read_config_file("config_teamocil/test1.yaml")
 teamocil_conf = {
diff --git a/tests/fixtures/config_teamocil/test2.py b/tests/fixtures/config_teamocil/test2.py
@@ -1,4 +1,4 @@
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 teamocil_yaml = test_utils.read_config_file("config_teamocil/test2.yaml")
 teamocil_dict = {
diff --git a/tests/fixtures/config_teamocil/test3.py b/tests/fixtures/config_teamocil/test3.py
@@ -1,4 +1,4 @@
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 teamocil_yaml = test_utils.read_config_file("config_teamocil/test3.yaml")
 
diff --git a/tests/fixtures/config_teamocil/test4.py b/tests/fixtures/config_teamocil/test4.py
@@ -1,4 +1,4 @@
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 teamocil_yaml = test_utils.read_config_file("config_teamocil/test4.yaml")
 
diff --git a/tests/fixtures/config_tmuxinator/test1.py b/tests/fixtures/config_tmuxinator/test1.py
@@ -1,4 +1,4 @@
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 tmuxinator_yaml = test_utils.read_config_file("config_tmuxinator/test1.yaml")
 tmuxinator_dict = {
diff --git a/tests/fixtures/config_tmuxinator/test2.py b/tests/fixtures/config_tmuxinator/test2.py
@@ -1,4 +1,4 @@
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 tmuxinator_yaml = test_utils.read_config_file("config_tmuxinator/test2.yaml")
 
diff --git a/tests/fixtures/config_tmuxinator/test3.py b/tests/fixtures/config_tmuxinator/test3.py
@@ -1,4 +1,4 @@
-from .. import _util as test_utils
+from .. import utils as test_utils
 
 tmuxinator_yaml = test_utils.read_config_file("config_tmuxinator/test3.yaml")
 
diff --git a/tests/fixtures/utils.py b/tests/fixtures/utils.py
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -28,7 +28,7 @@
 )
 from tmuxp.workspacebuilder import WorkspaceBuilder
 
-from .fixtures import _util as test_utils
+from .fixtures import utils as test_utils
 from .fixtures._util import FIXTURE_PATH
 
 
diff --git a/tests/test_workspacebuilder.py b/tests/test_workspacebuilder.py
@@ -17,7 +17,7 @@
 from tmuxp.workspacebuilder import WorkspaceBuilder
 
 from . import EXAMPLE_PATH, FIXTURES_PATH
-from .fixtures import _util as test_utils
+from .fixtures import utils as test_utils
 
 
 def test_split_windows(session):
diff --git a/tests/test_workspacefreezer.py b/tests/test_workspacefreezer.py
@@ -6,7 +6,7 @@
 from tmuxp import config
 from tmuxp.workspacebuilder import WorkspaceBuilder, freeze
 
-from .fixtures import _util as test_utils
+from .fixtures import utils as test_utils
 
 
 def test_freeze_config(session):

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-from . import _util # noqa`
	`1`	`+from . import utils # noqa`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from .. import _util as test_utils`
	`1`	`+from .. import utils as test_utils`
`2`	`2`
`3`	`3`	`before = test_utils.read_config_file("config/shell_command_before_session.yaml")`
`4`	`4`	`expected = test_utils.read_config_file(`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`)`
`29`	`29`	`from tmuxp.workspacebuilder import WorkspaceBuilder`
`30`	`30`
`31`		`-from .fixtures import _util as test_utils`
	`31`	`+from .fixtures import utils as test_utils`
`32`	`32`	`from .fixtures._util import FIXTURE_PATH`
`33`	`33`
`34`	`34`