From 9238543df7efc0adfea43e43e3bfb3c3f32ec3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 18 Jan 2013 17:32:01 +0000 Subject: morph2_tests: checks for python2.7 are not needed anymore As we use ordererdict for python < 2.7 as well See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d --- morphlib/morph2_tests.py | 60 ++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) (limited to 'morphlib/morph2_tests.py') diff --git a/morphlib/morph2_tests.py b/morphlib/morph2_tests.py index baa6f724..142b5949 100644 --- a/morphlib/morph2_tests.py +++ b/morphlib/morph2_tests.py @@ -14,9 +14,6 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -import sys -have_python27 = sys.version_info >= (2,7) - import StringIO import unittest @@ -202,9 +199,8 @@ class MorphologyTests(unittest.TestCase): Morphology, text) - if have_python27: - def test_writing_preserves_field_order(self): - text = '''{ + def test_writing_preserves_field_order(self): + text = '''{ "kind": "system", "disk-size": 1073741824, "description": "Some text", @@ -223,19 +219,18 @@ class MorphologyTests(unittest.TestCase): } ] }''' - morphology = Morphology(text) - output = StringIO.StringIO() - morphology.write_to_file(output) + morphology = Morphology(text) + output = StringIO.StringIO() + morphology.write_to_file(output) - text_lines = text.splitlines() - output_lines = output.getvalue().splitlines() + text_lines = text.splitlines() + output_lines = output.getvalue().splitlines() - # Verify that input and output are equal. - self.assertEqual(text_lines, output_lines) + # Verify that input and output are equal. + self.assertEqual(text_lines, output_lines) - if have_python27: - def test_writing_stratum_morphology_preserves_chunk_order(self): - text = '''{ + def test_writing_stratum_morphology_preserves_chunk_order(self): + text = '''{ "kind": "stratum", "chunks": [ { @@ -252,30 +247,29 @@ class MorphologyTests(unittest.TestCase): } ] }''' - morphology = Morphology(text) - output = StringIO.StringIO() - morphology.write_to_file(output) + morphology = Morphology(text) + output = StringIO.StringIO() + morphology.write_to_file(output) - text_lines = text.splitlines() - output_lines = output.getvalue().splitlines() + text_lines = text.splitlines() + output_lines = output.getvalue().splitlines() - # Verify that input and output are equal. - self.assertEqual(text_lines, output_lines) + # Verify that input and output are equal. + self.assertEqual(text_lines, output_lines) - if have_python27: - def test_writing_preserves_disk_size(self): - text = '''{ + def test_writing_preserves_disk_size(self): + text = '''{ "kind": "system", "disk-size": "1g", "arch": "x86_64", "system-kind": "syslinux-disk" }''' - morphology = Morphology(text) - output = StringIO.StringIO() - morphology.write_to_file(output) + morphology = Morphology(text) + output = StringIO.StringIO() + morphology.write_to_file(output) - text_lines = text.splitlines() - output_lines = output.getvalue().splitlines() + text_lines = text.splitlines() + output_lines = output.getvalue().splitlines() - # Verify that in- and output are the same. - self.assertEqual(text_lines, output_lines) + # Verify that in- and output are the same. + self.assertEqual(text_lines, output_lines) -- cgit v1.2.1