Merge branch 'devel-2.1'

[ganeti-local] / test / ganeti.ssh_unittest.py

diff --git a/test/ganeti.ssh_unittest.py b/test/ganeti.ssh_unittest.py
index 2121355..5afd590 100755 (executable)
--- a/test/ganeti.ssh_unittest.py
+++ b/test/ganeti.ssh_unittest.py
@@ -37,15 +37,16 @@ class TestKnownHosts(testutils.GanetiTestCase):
   """Test case for function writing the known_hosts file"""
 
   def setUp(self):
-    self.tmpfile = tempfile.NamedTemporaryFile()
+    testutils.GanetiTestCase.setUp(self)
+    self.tmpfile = self._CreateTempFile()
 
   def test(self):
     cfg = mocks.FakeConfig()
-    ssh.WriteKnownHostsFile(cfg, self.tmpfile.name)
-    self.assertFileContent(self.tmpfile.name,
+    ssh.WriteKnownHostsFile(cfg, self.tmpfile)
+    self.assertFileContent(self.tmpfile,
         "%s ssh-rsa %s\n" % (cfg.GetClusterName(),
                              mocks.FAKE_CLUSTER_KEY))
 
 
 if __name__ == '__main__':
-  unittest.main()
+  testutils.GanetiTestProgram()