Merge branch 'master' into ecdsa-deterministic

Conflicts:
	paramiko/ecdsakey.py

1 files changed, 0 insertions, 6 deletions

diff --git a/tests/test_util.py b/tests/test_util.py
index af6eceb5..69c75518 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -154,12 +154,6 @@ class UtilTest(ParamikoTest):
         finally:
             os.unlink('hostfile.temp')
 
-    def test_6_random(self):
-        from paramiko.common import rng
-        # just verify that we can pull out 32 bytes and not get an exception.
-        x = rng.read(32)
-        self.assertEqual(len(x), 32)
-
     def test_7_host_config_expose_issue_33(self):
         test_config_file = """
 Host www13.*