summaryrefslogtreecommitdiff
path: root/morphlib/buildsystem_tests.py
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-08-14 13:45:59 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-08-14 13:45:59 +0000
commitc1c331e7c545c7a2f0545d3b1ef9751c9571d357 (patch)
treed2a4edf71f2c7204808e4543f3d743a81e95a1bd /morphlib/buildsystem_tests.py
parentb2786c73c0f4d4b76f824e309598ce57065e30ab (diff)
parent5f705f1e2c95b988ae39df7820f4034c49f375e4 (diff)
downloadmorph-c1c331e7c545c7a2f0545d3b1ef9751c9571d357.tar.gz
Merge branch 'baserock/adamcoldrick/remove-morph2-tweaked'
Reviewed-by: Richard Maw
Diffstat (limited to 'morphlib/buildsystem_tests.py')
-rw-r--r--morphlib/buildsystem_tests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/morphlib/buildsystem_tests.py b/morphlib/buildsystem_tests.py
index 3171366b..56ba64d7 100644
--- a/morphlib/buildsystem_tests.py
+++ b/morphlib/buildsystem_tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -49,10 +49,10 @@ class BuildSystemTests(unittest.TestCase):
def test_has_install_commands(self):
self.assertEqual(self.bs['install-commands'], [])
- def test_returns_morphology_text(self):
+ def test_returns_morphology(self):
self.bs.name = 'fake'
- text = self.bs.get_morphology_text('foobar')
- self.assertTrue(type(text) in (str, unicode))
+ morph = self.bs.get_morphology('foobar')
+ self.assertTrue(morph.__class__.__name__ == 'Morphology')
class ManualBuildSystemTests(unittest.TestCase):