summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSylvain Th?nault <sylvain.thenault@logilab.fr>2010-04-20 07:45:12 +0200
committerSylvain Th?nault <sylvain.thenault@logilab.fr>2010-04-20 07:45:12 +0200
commit202cd1a34a3f3bfa268a8ec186b9309397a19f3d (patch)
tree4e05c1146e8b6405ceb5fe52f89b9a006ceb5478
parent368f60b6c082e43158aadbae55597a30a7f8882b (diff)
downloadlogilab-common-202cd1a34a3f3bfa268a8ec186b9309397a19f3d.tar.gz
test fixes
-rw-r--r--test/unittest_configuration.py12
-rw-r--r--test/unittest_textutils.py14
-rw-r--r--test/unittest_ureports_html.py2
3 files changed, 14 insertions, 14 deletions
diff --git a/test/unittest_configuration.py b/test/unittest_configuration.py
index 828309f..d485bbf 100644
--- a/test/unittest_configuration.py
+++ b/test/unittest_configuration.py
@@ -94,8 +94,7 @@ class ConfigurationTC(TestCase):
file = tempfile.mktemp()
stream = open(file, 'w')
try:
- stream.write("""# test configuration
-[Test]
+ stream.write("""[Test]
dothis=no
@@ -130,8 +129,7 @@ diffgroup=zou
def test_generate_config(self):
stream = StringIO()
self.cfg.generate_config(stream)
- self.assertLinesEquals(stream.getvalue().strip(), """# test configuration
-[TEST]
+ self.assertLinesEquals(stream.getvalue().strip(), """[TEST]
dothis=yes
@@ -159,8 +157,7 @@ diffgroup=pouet
self.cfg['value'] = ' '
stream = StringIO()
self.cfg.generate_config(stream)
- self.assertLinesEquals(stream.getvalue().strip(), """# test configuration
-[TEST]
+ self.assertLinesEquals(stream.getvalue().strip(), """[TEST]
dothis=yes
@@ -284,8 +281,7 @@ options:
read_old_config(self.cfg, changes, 'data/test.ini')
stream = StringIO()
self.cfg.generate_config(stream)
- self.assertLinesEquals(stream.getvalue().strip(), """# test configuration
-[TEST]
+ self.assertLinesEquals(stream.getvalue().strip(), """[TEST]
dothis=yes
diff --git a/test/unittest_textutils.py b/test/unittest_textutils.py
index 7dcf4e5..f5de745 100644
--- a/test/unittest_textutils.py
+++ b/test/unittest_textutils.py
@@ -108,8 +108,8 @@ class UnitsTC(TestCase):
def setUp(self):
self.units = {
'm':60,
- 'KB':1024,
- 'MB':1024*1024,
+ 'kb':1024,
+ 'mb':1024*1024,
}
def test_empty_base(self):
@@ -153,15 +153,19 @@ class UnitsTC(TestCase):
def test_unit_singleunit_multipleletter(self):
result = tu.apply_units('47KB', self.units)
- self.assertEquals(result, 47 * self.units['KB'] )
+ self.assertEquals(result, 47 * self.units['kb'] )
+
+ def test_unit_singleunit_caseinsensitive(self):
+ result = tu.apply_units('47kb', self.units)
+ self.assertEquals(result, 47 * self.units['kb'] )
def test_unit_multipleunit(self):
result = tu.apply_units('47KB 1.5MB', self.units)
- self.assertEquals(result, 47 * self.units['KB'] + 1.5 * self.units['MB'])
+ self.assertEquals(result, 47 * self.units['kb'] + 1.5 * self.units['mb'])
def test_unit_with_blank(self):
result = tu.apply_units('1 000 KB', self.units)
- self.assertEquals(result, 1000 * self.units['KB'])
+ self.assertEquals(result, 1000 * self.units['kb'])
RGX = re.compile('abcd')
class PrettyMatchTC(TestCase):
diff --git a/test/unittest_ureports_html.py b/test/unittest_ureports_html.py
index d6dcb02..8a2c50c 100644
--- a/test/unittest_ureports_html.py
+++ b/test/unittest_ureports_html.py
@@ -37,7 +37,7 @@ Blabla bla</p></div>
# Table tests #############################################################
table_base = '''<table>\n<tr class="odd">\n<td>head1</td>\n<td>head2</td>\n</tr>\n<tr class="even">\n<td>cell1</td>\n<td>cell2</td>\n</tr>\n</table>\n'''
field_table = '''<table class="field" id="mytable">\n<tr class="odd">\n<td>f1</td>\n<td>v1</td>\n</tr>\n<tr class="even">\n<td>f22</td>\n<td>v22</td>\n</tr>\n<tr class="odd">\n<td>f333</td>\n<td>v333</td>\n</tr>\n</table>\n'''
- advanced_table = '''<table class="whatever" id="mytable">\n<tr class="header">\n<th>field</th>\n<th>value</th>\n</tr>\n<tr class="even">\n<td>f1</td>\n<td>v1</td>\n</tr>\n<tr class="odd">\n<td>f22</td>\n<td>v22</td>\n</tr>\n<tr class="even">\n<td>f333</td>\n<td>v333</td>\n</tr>\n<tr class="odd">\n<td> <a href="http://www.perdu.com">toi perdu ?</a></td>\n<td>&nbsp;</td>\n</tr>\n</table>\n'''
+ advanced_table = '''<table class="whatever" id="mytable">\n<tr class="header">\n<th>field</th>\n<th>value</th>\n</tr>\n<tr class="even">\n<td>f1</td>\n<td>v1</td>\n</tr>\n<tr class="odd">\n<td>f22</td>\n<td>v22</td>\n</tr>\n<tr class="even">\n<td>f333</td>\n<td>v333</td>\n</tr>\n<tr class="odd">\n<td> <a href="http://www.perdu.com">toi perdu ?</a></td>\n<td>&#160;</td>\n</tr>\n</table>\n'''
# VerbatimText tests ######################################################