From 41b10cf61135eda6425847c50f10faaca77361b7 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Fri, 16 Apr 2010 17:19:40 +0100
Subject: [PATCH] uidpool: test the separator= argument
Also, fix the string quoting style.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Balazs Lecz <leczb@google.com>
---
test/ganeti.uidpool_unittest.py | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/test/ganeti.uidpool_unittest.py b/test/ganeti.uidpool_unittest.py
index 638c8b250..a5c0ca33b 100755
--- a/test/ganeti.uidpool_unittest.py
+++ b/test/ganeti.uidpool_unittest.py
@@ -46,8 +46,14 @@ class TestUidPool(testutils.GanetiTestCase):
def testParseUidPool(self):
self.assertEqualValues(
- uidpool.ParseUidPool('1-100,200,'),
+ uidpool.ParseUidPool("1-100,200,"),
[(1, 100), (200, 200)])
+ self.assertEqualValues(
+ uidpool.ParseUidPool("1000:2000-2500", separator=":"),
+ [(1000, 1000), (2000, 2500)])
+ self.assertEqualValues(
+ uidpool.ParseUidPool("1000\n2000-2500", separator="\n"),
+ [(1000, 1000), (2000, 2500)])
def testCheckUidPool(self):
# UID < UIDPOOL_UID_MIN
@@ -66,7 +72,13 @@ class TestUidPool(testutils.GanetiTestCase):
def testFormatUidPool(self):
self.assertEqualValues(
uidpool.FormatUidPool([(1, 100), (200, 200)]),
- '1-100, 200'),
+ "1-100, 200")
+ self.assertEqualValues(
+ uidpool.FormatUidPool([(1, 100), (200, 200)], separator=":"),
+ "1-100:200")
+ self.assertEqualValues(
+ uidpool.FormatUidPool([(1, 100), (200, 200)], separator="\n"),
+ "1-100\n200")
if __name__ == '__main__':
--
GitLab