@@ -12,7 +12,11 @@ def main(cli: Cli) -> None:
12
12
"""Stub main function for testing.
13
13
14
14
Args:
15
+ <<<<<<< HEAD
15
16
cli: Cli object.
17
+ =======
18
+ cli (Cli): Cli object.
19
+ >>>>>>> 556acba (Add some tests)
16
20
"""
17
21
cli .parse_args ()
18
22
cli .init_output ()
@@ -24,7 +28,11 @@ def test_cpi(monkeypatch: pytest.MonkeyPatch) -> None:
24
28
"""Test the cpi option.
25
29
26
30
Args:
31
+ <<<<<<< HEAD
27
32
monkeypatch: Pytest fixture.
33
+ =======
34
+ monkeypatch (pytest.MonkeyPatch): Pytest fixture.
35
+ >>>>>>> 556acba (Add some tests)
28
36
"""
29
37
monkeypatch .setattr ("sys.argv" , ["ansible-dev-environment" , "install" , "--cpi" ])
30
38
cli = Cli ()
@@ -40,7 +48,11 @@ def test_tty(monkeypatch: pytest.MonkeyPatch) -> None:
40
48
"""Test term features with tty.
41
49
42
50
Args:
51
+ <<<<<<< HEAD
43
52
monkeypatch: Pytest fixture.
53
+ =======
54
+ monkeypatch (pytest.MonkeyPatch): Pytest fixture.
55
+ >>>>>>> 556acba (Add some tests)
44
56
"""
45
57
monkeypatch .setattr ("sys.stdout.isatty" , (lambda : True ))
46
58
monkeypatch .setattr ("os.environ" , {"NO_COLOR" : "" })
@@ -85,8 +97,12 @@ def test_editable_many(
85
97
"""Test the editable option with too many arguments.
86
98
87
99
Args:
100
+ <<<<<<< HEAD
88
101
capsys: Pytest stdout capture fixture.
89
102
monkeypatch: Pytest fixture.
103
+ =======
104
+ monkeypatch (pytest.MonkeyPatch): Pytest fixture.
105
+ >>>>>>> 556acba (Add some tests)
90
106
"""
91
107
monkeypatch .setattr (
92
108
"sys.argv" ,
@@ -143,7 +159,10 @@ def test_acp_env_var_set(
143
159
"""Test the ansible collection path environment variable set.
144
160
145
161
Args:
162
+ <<<<<<< HEAD
146
163
env_var: Environment variable name.
164
+ =======
165
+ >>>>>>> 556acba (Add some tests)
147
166
capsys: Pytest stdout capture fixture.
148
167
monkeypatch: Pytest fixture.
149
168
"""
@@ -200,6 +219,7 @@ def test_collections_in_user(
200
219
exists = Path .exists
201
220
202
221
def _exists (self : Path ) -> bool :
222
+ < << << << HEAD
203
223
"""Patch the exists method.
204
224
205
225
Args:
@@ -208,6 +228,9 @@ def _exists(self: Path) -> bool:
208
228
Returns:
209
229
bool: True if the path exists.
210
230
"""
231
+ == == == =
232
+ """Patch the exists method."""
233
+ >> >> >> > 556 acba (Add some tests )
211
234
if self == usr_path :
212
235
return True
213
236
return exists (self )
@@ -217,6 +240,7 @@ def _exists(self: Path) -> bool:
217
240
iterdir = Path .iterdir
218
241
219
242
def _iterdir (self : Path ) -> list [Path ] | Generator [Path , None , None ]:
243
+ < << << << HEAD
220
244
"""Patch the iterdir method.
221
245
222
246
Args:
@@ -225,6 +249,9 @@ def _iterdir(self: Path) -> list[Path] | Generator[Path, None, None]:
225
249
Returns:
226
250
List of paths or generator.
227
251
"""
252
+ == == == =
253
+ """Patch the iterdir method."""
254
+ >> >> >> > 556 acba (Add some tests )
228
255
if self == usr_path :
229
256
return [usr_path / "ansible_collections" ]
230
257
return iterdir (self )
0 commit comments