summaryrefslogtreecommitdiff
path: root/morphlib/morph2_tests.py
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2013-01-18 17:32:01 +0000
committerJavier Jardón <javier.jardon@codethink.co.uk>2013-01-18 17:32:44 +0000
commit9238543df7efc0adfea43e43e3bfb3c3f32ec3d5 (patch)
tree7629e35a1a48e36471934ca78dee59bc47645ad3 /morphlib/morph2_tests.py
parent37f8d84d7ab356169bf7c04bdecb39a61b85c88d (diff)
downloadmorph-9238543df7efc0adfea43e43e3bfb3c3f32ec3d5.tar.gz
morph2_tests: checks for python2.7 are not needed anymore
As we use ordererdict for python < 2.7 as well See 37f8d84d7ab356169bf7c04bdecb39a61b85c88d
Diffstat (limited to 'morphlib/morph2_tests.py')
-rw-r--r--morphlib/morph2_tests.py60
1 files changed, 27 insertions, 33 deletions
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)