move network test from ui to separate file

monkeysign/tests/test_network.py

@@ -24,12 +24,14 @@ be ran without internet access.
 
 import unittest
 
-import sys, os
-import signal
-sys.path.insert(0, os.path.dirname(__file__) + '/..')
+import os
+import sys
+sys.path.insert(0, os.path.dirname(__file__) + '/../..')
 
 from monkeysign.gpg import TempKeyring
 from test_lib import TestTimeLimit, AlarmException, find_test_file
+import test_ui
+
 
 class TestGpgNetwork(TestTimeLimit):
     """Separate test cases for functions that hit the network
@@ -63,5 +65,14 @@ the network forever"""
         TestTimeLimit.tearDown(self)
         del self.gpg
 
+
+class KeyserverTests(test_ui.BaseTestCase):
+    args = ['--keyserver', 'pool.sks-keyservers.net']
+    pattern = '7B75921E'
+
+    def test_find_key(self):
+        """this should find the key on the keyservers"""
+        self.ui.find_key()
+
 if __name__ == '__main__':
     unittest.main()

monkeysign/tests/test_ui.py

@@ -451,14 +451,6 @@ Content-Transfer-Encoding: 7bit
         match = re.compile("""From: (([^ ]* )|("[^"]*" ))?<[^> ]*>$""", re.DOTALL | re.MULTILINE)
         self.assertRegexpMatches(self.email.as_string(), match)
 
-class KeyserverTests(BaseTestCase):
-    args = [ '--keyserver', 'pool.sks-keyservers.net' ]
-    pattern = '7B75921E'
-
-    def test_find_key(self):
-        """this should find the key on the keyservers"""
-        self.ui.find_key()
-
 class FakeKeyringTests(BaseTestCase):
     args = []
     pattern = '96F47C6A'