Clean up imports in common

1 files changed, 6 insertions, 15 deletions

diff --git a/src/account/test/common.py b/src/account/test/common.py
index 07543b3..28060ab 100644
--- a/src/account/test/common.py
+++ b/src/account/test/common.py
@@ -21,17 +21,13 @@
 Base class and utilities for all OpenLMI Account tests.
 """
 
-import hashlib
 import os
-import tempfile
-import string
 import subprocess
 from collections import defaultdict
-from collections import OrderedDict
 
-import methods
-import lmi.test.util
+from methods import field_is_unique
 from lmi.test import lmibase
+from lmi.test.util import random_string
 
 
 class AccountBase(lmibase.LmiTestCase):
@@ -48,10 +44,6 @@ class AccountBase(lmibase.LmiTestCase):
         cls.group_name = os.environ.get("LMI_ACCOUNT_GROUP")
 
 
-## ......................................................................... ##
-## Validators
-## ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' ##
-
 class PasswdFile():
     """
     Parse /etc/passwd and perform basic heuristics to assess validity.
@@ -101,7 +93,7 @@ class PasswdFile():
         """
         dups = defaultdict(int)
         for field in self.options['unique']:
-            if not methods.field_is_unique(field, self.users):
+            if not field_is_unique(field, self.users):
                 dups[field] += 1
         return dict(dups)
 
@@ -228,9 +220,8 @@ class TestUserSet(object):
         """
         name = None
         existing = UserOps.list_users()
-        rs = lmi.test.util.random_string
         while not name or name in existing:
-            name = rs(strength=self.strength, prefix=self.prefix)
+            name = random_string(strength=self.strength, prefix=self.prefix)
         return name
 
     def add(self, name=None):
@@ -261,5 +252,5 @@ class TestUserSet(object):
         """
         Remove all testing users
         """
-        [UserOps.clean_account(n) for n in self._our_users]
-        self._our_users = set()
+        while self._our_users:
+            UserOps.clean_account(self._our_users.pop())