Revision 51596eb2 test/ganeti.utils_unittest.py

b/test/ganeti.utils_unittest.py
128 128
  """Testing case for the RunCmd function"""
129 129

  
130 130
  def setUp(self):
131
    testutils.GanetiTestCase.setUp(self)
131 132
    self.magic = time.ctime() + " ganeti test"
132
    fh, self.fname = tempfile.mkstemp()
133
    os.close(fh)
134

  
135
  def tearDown(self):
136
    if self.fname:
137
      utils.RemoveFile(self.fname)
133
    self.fname = self._CreateTempFile()
138 134

  
139 135
  def testOk(self):
140 136
    """Test successful exit code"""
......
451 447
           'ssh-dss AAAAB3NzaC1w520smc01ms0jfJs22 root@key-b')
452 448

  
453 449
  def setUp(self):
454
    (fd, self.tmpname) = tempfile.mkstemp(prefix='ganeti-test')
450
    testutils.GanetiTestCase.setUp(self)
451
    self.tmpname = self._CreateTempFile()
452
    handle = open(self.tmpname, 'w')
455 453
    try:
456
      handle = os.fdopen(fd, 'w')
457
      try:
458
        handle.write("%s\n" % TestSshKeys.KEY_A)
459
        handle.write("%s\n" % TestSshKeys.KEY_B)
460
      finally:
461
        handle.close()
462
    except:
463
      utils.RemoveFile(self.tmpname)
464
      raise
465

  
466
  def tearDown(self):
467
    utils.RemoveFile(self.tmpname)
468
    del self.tmpname
454
      handle.write("%s\n" % TestSshKeys.KEY_A)
455
      handle.write("%s\n" % TestSshKeys.KEY_B)
456
    finally:
457
      handle.close()
469 458

  
470 459
  def testAddingNewKey(self):
471 460
    AddAuthorizedKey(self.tmpname, 'ssh-dss AAAAB3NzaC1kc3MAAACB root@test')
......
517 506
  """Test functions modifying /etc/hosts"""
518 507

  
519 508
  def setUp(self):
520
    (fd, self.tmpname) = tempfile.mkstemp(prefix='ganeti-test')
509
    testutils.GanetiTestCase.setUp(self)
510
    self.tmpname = self._CreateTempFile()
511
    handle = open(self.tmpname, 'w')
521 512
    try:
522
      handle = os.fdopen(fd, 'w')
523
      try:
524
        handle.write('# This is a test file for /etc/hosts\n')
525
        handle.write('127.0.0.1\tlocalhost\n')
526
        handle.write('192.168.1.1 router gw\n')
527
      finally:
528
        handle.close()
529
    except:
530
      utils.RemoveFile(self.tmpname)
531
      raise
532

  
533
  def tearDown(self):
534
    utils.RemoveFile(self.tmpname)
535
    del self.tmpname
513
      handle.write('# This is a test file for /etc/hosts\n')
514
      handle.write('127.0.0.1\tlocalhost\n')
515
      handle.write('192.168.1.1 router gw\n')
516
    finally:
517
      handle.close()
536 518

  
537 519
  def testSettingNewIp(self):
538 520
    SetEtcHostsEntry(self.tmpname, '1.2.3.4', 'myhost.domain.tld', ['myhost'])

Also available in: Unified diff