Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Lib/test/test_uuid.py
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ def test_uuid1_safe(self):
# dependent on the underlying platform support. At least it cannot be
# unknown (unless I suppose the platform is buggy).
self.assertNotEqual(u.is_safe, self.uuid.SafeUUID.unknown)
self.assertEqual(u.version, 1)

@contextlib.contextmanager
def mock_generate_time_safe(self, safe_value):
Expand All @@ -612,24 +613,28 @@ def test_uuid1_unknown(self):
with self.mock_generate_time_safe(None):
u = self.uuid.uuid1()
self.assertEqual(u.is_safe, self.uuid.SafeUUID.unknown)
self.assertEqual(u.version, 1)

@unittest.skipUnless(os.name == 'posix', 'POSIX-only test')
def test_uuid1_is_safe(self):
with self.mock_generate_time_safe(0):
u = self.uuid.uuid1()
self.assertEqual(u.is_safe, self.uuid.SafeUUID.safe)
self.assertEqual(u.version, 1)

@unittest.skipUnless(os.name == 'posix', 'POSIX-only test')
def test_uuid1_is_unsafe(self):
with self.mock_generate_time_safe(-1):
u = self.uuid.uuid1()
self.assertEqual(u.is_safe, self.uuid.SafeUUID.unsafe)
self.assertEqual(u.version, 1)

@unittest.skipUnless(os.name == 'posix', 'POSIX-only test')
def test_uuid1_bogus_return_value(self):
with self.mock_generate_time_safe(3):
u = self.uuid.uuid1()
self.assertEqual(u.is_safe, self.uuid.SafeUUID.unknown)
self.assertEqual(u.version, 1)

def test_uuid1_time(self):
with mock.patch.object(self.uuid, '_generate_time_safe', None), \
Expand Down
1 change: 1 addition & 0 deletions Lib/uuid.py
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@ def uuid1(node=None, clock_seq=None):
is_safe = SafeUUID(safely_generated)
except ValueError:
is_safe = SafeUUID.unknown
# The version field is assumed to be handled by _generate_time_safe().
return UUID(bytes=uuid_time, is_safe=is_safe)

global _last_timestamp
Expand Down
Loading