diff options
Diffstat (limited to 'morphlib/morphset_tests.py')
-rw-r--r-- | morphlib/morphset_tests.py | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/morphlib/morphset_tests.py b/morphlib/morphset_tests.py index d6908844..8679c64a 100644 --- a/morphlib/morphset_tests.py +++ b/morphlib/morphset_tests.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013, 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 @@ -80,27 +80,6 @@ class MorphologySetTests(unittest.TestCase): self.morphs.add_morphology(self.system) self.assertEqual(self.morphs.morphologies, [self.system]) - def test_get_stratum_in_system(self): - self.morphs.add_morphology(self.system) - self.morphs.add_morphology(self.stratum) - self.assertEqual( - self.morphs.get_stratum_in_system( - self.system, self.stratum['name']), - self.stratum) - - def test_raises_stratum_not_in_system_error(self): - self.morphs.add_morphology(self.system) - self.morphs.add_morphology(self.stratum) - self.assertRaises( - morphlib.morphset.StratumNotInSystemError, - self.morphs.get_stratum_in_system, self.system, 'unknown-stratum') - - def test_raises_stratum_not_in_set_error(self): - self.morphs.add_morphology(self.system) - self.assertRaises( - morphlib.morphset.StratumNotInSetError, - self.morphs.get_stratum_in_system, self.system, 'foo-stratum') - def test_get_chunk_triplet(self): self.morphs.add_morphology(self.system) self.morphs.add_morphology(self.stratum) @@ -119,7 +98,7 @@ class MorphologySetTests(unittest.TestCase): self.morphs.change_ref( self.stratum.repo_url, self.stratum.ref, - self.stratum.filename, + self.stratum['name'], 'new-ref') self.assertEqual(self.stratum.ref, 'new-ref') self.assertEqual( @@ -155,7 +134,7 @@ class MorphologySetTests(unittest.TestCase): self.morphs.change_ref( self.stratum.repo_url, self.stratum.ref, - self.stratum.filename, + self.stratum['name'], 'new-ref') self.assertEqual( other_stratum['build-depends'][0], @@ -172,7 +151,7 @@ class MorphologySetTests(unittest.TestCase): self.morphs.change_ref( 'test:foo-chunk', 'master', - 'foo-chunk.morph', + 'foo-chunk', 'new-ref') self.assertEqual( self.stratum['chunks'], |