Use tempfile's naming generator to create session/window names

Author: tony

tmuxp/testsuite/helpers.py

@@ -15,8 +15,8 @@
 import logging
 import os
 import sys
+import tempfile
 from contextlib import contextmanager
-from random import randint
 
 from tmuxp import exc
 from tmuxp.testsuite import t
@@ -30,18 +30,20 @@
 
 TEST_SESSION_PREFIX = 'test tmuxp_'
 
+namer = tempfile._RandomNameSequence()
+
 
 def get_test_session_name(server, prefix=TEST_SESSION_PREFIX):
     while True:
-        session_name = prefix + str(randint(0, 9999999))
+        session_name = prefix + next(namer)
         if not t.has_session(session_name):
             break
     return session_name
 
 
 def get_test_window_name(session, prefix=TEST_SESSION_PREFIX):
     while True:
-        window_name = prefix + str(randint(0, 9999999))
+        window_name = prefix + next(namer)
         if not session.findWhere(window_name=window_name):
             break
     return window_name

tmuxp/testsuite/session.py

@@ -11,11 +11,10 @@
 
 import logging
 import unittest
-from random import randint
 
 from tmuxp import Pane, Session, Window
 from tmuxp.testsuite import t
-from tmuxp.testsuite.helpers import TEST_SESSION_PREFIX, TmuxTestCase
+from tmuxp.testsuite.helpers import TEST_SESSION_PREFIX, TmuxTestCase, namer
 
 logger = logging.getLogger(__name__)
 
@@ -99,7 +98,7 @@ class SessionNewTest(TmuxTestCase):
 
     def test_new_session(self):
         """Server.new_session creates new session."""
-        new_session_name = TEST_SESSION_PREFIX + str(randint(0, 1337))
+        new_session_name = TEST_SESSION_PREFIX + next(namer)
         new_session = t.new_session(session_name=new_session_name, detach=True)
 
         self.assertIsInstance(new_session, Session)

tmuxp/testsuite/tmuxobject.py

@@ -10,12 +10,11 @@
                         unicode_literals, with_statement)
 
 import logging
-import random
 import unittest
 
 from tmuxp import Pane, Session, Window
 from tmuxp.testsuite import t
-from tmuxp.testsuite.helpers import TEST_SESSION_PREFIX, TmuxTestCase
+from tmuxp.testsuite.helpers import TEST_SESSION_PREFIX, TmuxTestCase, namer
 
 logger = logging.getLogger(__name__)
 
@@ -62,9 +61,7 @@ def test_findWhere_None(self):
         """.findWhere returns None if no results found."""
 
         while True:
-            nonexistant_session = TEST_SESSION_PREFIX + str(
-                random.randint(0, 9999)
-            )
+            nonexistant_session = TEST_SESSION_PREFIX + next(namer)
 
             if not t.has_session(nonexistant_session):
                 break
@@ -176,7 +173,7 @@ def test_getById(self):
             self.assertEqual(get_by_id, session)
             self.assertIsInstance(get_by_id, Session)
             self.assertIsNone(t.getById(
-                '$' + str(random.randint(50000, 90000))
+                '$' + next(namer)
             ))
 
             # session.getById
@@ -189,7 +186,7 @@ def test_getById(self):
                 self.assertIsInstance(get_by_id, Window)
 
                 self.assertIsNone(session.getById(
-                    '@' + str(random.randint(50000, 90000))
+                    '@' + next(namer)
                 ))
 
                 # window.getById
@@ -201,7 +198,7 @@ def test_getById(self):
                     self.assertEqual(get_by_id, pane)
                     self.assertIsInstance(get_by_id, Pane)
                     self.assertIsNone(window.getById(
-                        '%' + str(random.randint(50000, 90000))
+                        '%' + next(namer)
                     ))