Revision 8342c325 test/ganeti.utils_unittest.py

b/test/ganeti.utils_unittest.py
174 174
  def setUp(self):
175 175
    self.dir = tempfile.mkdtemp()
176 176
    self.f_dpn = lambda name: os.path.join(self.dir, "%s.pid" % name)
177
    utils.DaemonPidFileName = self.f_dpn
178 177

  
179 178
  def testPidFileFunctions(self):
180 179
    pid_file = self.f_dpn('test')
......
187 186
    self.failUnlessRaises(errors.LockError, utils.WritePidFile,
188 187
                          self.f_dpn('test'))
189 188
    os.close(fd)
190
    utils.RemovePidFile('test')
189
    utils.RemovePidFile(self.f_dpn("test"))
191 190
    self.failIf(os.path.exists(pid_file),
192 191
                "PID file should not exist anymore")
193 192
    self.failUnlessEqual(utils.ReadPidFile(pid_file), 0,
......
200 199
    # but now, even with the file existing, we should be able to lock it
201 200
    fd = utils.WritePidFile(self.f_dpn('test'))
202 201
    os.close(fd)
203
    utils.RemovePidFile('test')
202
    utils.RemovePidFile(self.f_dpn("test"))
204 203
    self.failIf(os.path.exists(pid_file),
205 204
                "PID file should not exist anymore")
206 205

  
......
222 221
    self.failUnless(utils.IsProcessAlive(new_pid))
223 222
    utils.KillProcess(new_pid, waitpid=True)
224 223
    self.failIf(utils.IsProcessAlive(new_pid))
225
    utils.RemovePidFile('child')
224
    utils.RemovePidFile(self.f_dpn('child'))
226 225
    self.failUnlessRaises(errors.ProgrammerError, utils.KillProcess, 0)
227 226

  
228 227
  def tearDown(self):

Also available in: Unified diff