Skip to content

Commit

Permalink
Modernize test_newer_pairwise_group by using tmp_path and a SimpleNam…
Browse files Browse the repository at this point in the history
…espace.
  • Loading branch information
jaraco committed Nov 5, 2023
1 parent 378d0d5 commit 501b753
Showing 1 changed file with 17 additions and 16 deletions.
33 changes: 17 additions & 16 deletions distutils/tests/test_modified.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
"""Tests for distutils._modified."""
import os
import types

import pytest

from distutils._modified import newer, newer_pairwise, newer_group, newer_pairwise_group
from distutils.errors import DistutilsFileError
from distutils.tests import support
import pytest


class TestDepUtil(support.TempdirManager):
Expand Down Expand Up @@ -92,27 +94,26 @@ def test_newer_group(self):


@pytest.fixture
def groups_target(tmpdir):
"""Sets up some older sources, a target and newer sources.
Returns a 3-tuple in this order.
def groups_target(tmp_path):
"""
Set up some older sources, a target, and newer sources.
Returns a simple namespace with these values.
"""
creation_order = ['older.c', 'older.h', 'target.o', 'newer.c', 'newer.h']
mtime = 0
filenames = ['older.c', 'older.h', 'target.o', 'newer.c', 'newer.h']
paths = [tmp_path / name for name in filenames]

for i in range(len(creation_order)):
creation_order[i] = os.path.join(str(tmpdir), creation_order[i])
with open(creation_order[i], 'w'):
pass
for mtime, path in enumerate(paths):
path.write_text('', encoding='utf-8')

# make sure modification times are sequential
os.utime(creation_order[i], (mtime, mtime))
mtime += 1
os.utime(path, (mtime, mtime))

return creation_order[:2], creation_order[2], creation_order[3:]
return types.SimpleNamespace(older=paths[:2], target=paths[2], newer=paths[3:])


def test_newer_pairwise_group(groups_target):
older = newer_pairwise_group([groups_target[0]], [groups_target[1]])
newer = newer_pairwise_group([groups_target[2]], [groups_target[1]])
older = newer_pairwise_group([groups_target.older], [groups_target.target])
newer = newer_pairwise_group([groups_target.newer], [groups_target.target])
assert older == ([], [])
assert newer == ([groups_target[2]], [groups_target[1]])
assert newer == ([groups_target.newer], [groups_target.target])

0 comments on commit 501b753

Please sign in to comment.