Revision 2287b920 test/ganeti.http_unittest.py

b/test/ganeti.http_unittest.py
26 26
import unittest
27 27
import time
28 28
import tempfile
29
from cStringIO import StringIO
29 30

  
30 31
from ganeti import http
31 32

  
......
290 291
          self.assert_(ac.called)
291 292

  
292 293

  
293
class TestReadPasswordFile(testutils.GanetiTestCase):
294
  def setUp(self):
295
    testutils.GanetiTestCase.setUp(self)
296

  
297
    self.tmpfile = tempfile.NamedTemporaryFile()
298

  
294
class TestReadPasswordFile(unittest.TestCase):
299 295
  def testSimple(self):
300
    self.tmpfile.write("user1 password")
301
    self.tmpfile.flush()
302

  
303
    users = http.auth.ReadPasswordFile(self.tmpfile.name)
296
    users = http.auth.ParsePasswordFile("user1 password")
304 297
    self.assertEqual(len(users), 1)
305 298
    self.assertEqual(users["user1"].password, "password")
306 299
    self.assertEqual(len(users["user1"].options), 0)
307 300

  
308 301
  def testOptions(self):
309
    self.tmpfile.write("# Passwords\n")
310
    self.tmpfile.write("user1 password\n")
311
    self.tmpfile.write("\n")
312
    self.tmpfile.write("# Comment\n")
313
    self.tmpfile.write("user2 pw write,read\n")
314
    self.tmpfile.write("   \t# Another comment\n")
315
    self.tmpfile.write("invalidline\n")
316
    self.tmpfile.flush()
317

  
318
    users = http.auth.ReadPasswordFile(self.tmpfile.name)
302
    buf = StringIO()
303
    buf.write("# Passwords\n")
304
    buf.write("user1 password\n")
305
    buf.write("\n")
306
    buf.write("# Comment\n")
307
    buf.write("user2 pw write,read\n")
308
    buf.write("   \t# Another comment\n")
309
    buf.write("invalidline\n")
310

  
311
    users = http.auth.ParsePasswordFile(buf.getvalue())
319 312
    self.assertEqual(len(users), 2)
320 313
    self.assertEqual(users["user1"].password, "password")
321 314
    self.assertEqual(len(users["user1"].options), 0)

Also available in: Unified diff