Skip to content

Commit ad4f5f9

Browse files
little-dudeshin-
authored andcommitted
tests: fix failure due to pytest deprecation
Signed-off-by: Corentin Henry <[email protected]>
1 parent cafb802 commit ad4f5f9

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tests/unit/utils_config_test.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import tempfile
55
import json
66

7-
from py.test import ensuretemp
8-
from pytest import mark
7+
from pytest import mark, fixture
8+
99
from docker.utils import config
1010

1111
try:
@@ -15,49 +15,49 @@
1515

1616

1717
class FindConfigFileTest(unittest.TestCase):
18-
def tmpdir(self, name):
19-
tmpdir = ensuretemp(name)
20-
self.addCleanup(tmpdir.remove)
21-
return tmpdir
18+
19+
@fixture(autouse=True)
20+
def tmpdir(self, tmpdir):
21+
self.mkdir = tmpdir.mkdir
2222

2323
def test_find_config_fallback(self):
24-
tmpdir = self.tmpdir('test_find_config_fallback')
24+
tmpdir = self.mkdir('test_find_config_fallback')
2525

2626
with mock.patch.dict(os.environ, {'HOME': str(tmpdir)}):
2727
assert config.find_config_file() is None
2828

2929
def test_find_config_from_explicit_path(self):
30-
tmpdir = self.tmpdir('test_find_config_from_explicit_path')
30+
tmpdir = self.mkdir('test_find_config_from_explicit_path')
3131
config_path = tmpdir.ensure('my-config-file.json')
3232

3333
assert config.find_config_file(str(config_path)) == str(config_path)
3434

3535
def test_find_config_from_environment(self):
36-
tmpdir = self.tmpdir('test_find_config_from_environment')
36+
tmpdir = self.mkdir('test_find_config_from_environment')
3737
config_path = tmpdir.ensure('config.json')
3838

3939
with mock.patch.dict(os.environ, {'DOCKER_CONFIG': str(tmpdir)}):
4040
assert config.find_config_file() == str(config_path)
4141

4242
@mark.skipif("sys.platform == 'win32'")
4343
def test_find_config_from_home_posix(self):
44-
tmpdir = self.tmpdir('test_find_config_from_home_posix')
44+
tmpdir = self.mkdir('test_find_config_from_home_posix')
4545
config_path = tmpdir.ensure('.docker', 'config.json')
4646

4747
with mock.patch.dict(os.environ, {'HOME': str(tmpdir)}):
4848
assert config.find_config_file() == str(config_path)
4949

5050
@mark.skipif("sys.platform == 'win32'")
5151
def test_find_config_from_home_legacy_name(self):
52-
tmpdir = self.tmpdir('test_find_config_from_home_legacy_name')
52+
tmpdir = self.mkdir('test_find_config_from_home_legacy_name')
5353
config_path = tmpdir.ensure('.dockercfg')
5454

5555
with mock.patch.dict(os.environ, {'HOME': str(tmpdir)}):
5656
assert config.find_config_file() == str(config_path)
5757

5858
@mark.skipif("sys.platform != 'win32'")
5959
def test_find_config_from_home_windows(self):
60-
tmpdir = self.tmpdir('test_find_config_from_home_windows')
60+
tmpdir = self.mkdir('test_find_config_from_home_windows')
6161
config_path = tmpdir.ensure('.docker', 'config.json')
6262

6363
with mock.patch.dict(os.environ, {'USERPROFILE': str(tmpdir)}):

0 commit comments

Comments
 (0)