diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-08-10 12:21:30 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-17 14:41:43 +0100 |
commit | 552b1feeef678c0eaa35917a374666bcfb0d4ff7 (patch) | |
tree | 7367745bf0faa116042d876bc2959d8c528530e6 /bitbake/lib/toaster | |
parent | 1f7d7bf2164983f8b254ef873b73e074721821db (diff) | |
download | poky-552b1feeef678c0eaa35917a374666bcfb0d4ff7.tar.gz |
bitbake: toaster: remove duplicated code
Removed test_dual_layersource method from ProjectLVSelectionTestCase
as identical method presents in LayerVersionEquivalenceTestCase.
(Bitbake rev: 5611c6b911e8a638f462e80e924ac9265a2199f5)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r-- | bitbake/lib/toaster/orm/tests.py | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/bitbake/lib/toaster/orm/tests.py b/bitbake/lib/toaster/orm/tests.py index 168bafa1de..6837038781 100644 --- a/bitbake/lib/toaster/orm/tests.py +++ b/bitbake/lib/toaster/orm/tests.py | |||
@@ -166,20 +166,3 @@ class ProjectLVSelectionTestCase(TestCase): | |||
166 | self.assertTrue(len(compatible_layerversions) == 1) | 166 | self.assertTrue(len(compatible_layerversions) == 1) |
167 | self.assertTrue(compatible_layerversions[0] == self.lver) | 167 | self.assertTrue(compatible_layerversions[0] == self.lver) |
168 | 168 | ||
169 | |||
170 | def test_dual_layersource(self): | ||
171 | # if we have two layers with the same name, from different layer sources, we expect both layers in, in increasing priority of the layer source | ||
172 | ls2 = LayerSource.objects.create(name = "dummy-layersource2", sourcetype = LayerSource.TYPE_LOCAL, apiurl="testing") | ||
173 | |||
174 | # assign a lower priority for the second layer source | ||
175 | Release.objects.get(name="default-release").releaselayersourcepriority_set.create(layer_source = ls2, priority = 2) | ||
176 | |||
177 | # create a new layer_version for a layer with the same name coming from the second layer source | ||
178 | self.layer2 = Layer.objects.create(name="meta-testlayer", layer_source = ls2) | ||
179 | self.layerversion2 = Layer_Version.objects.create(layer = self.layer2, layer_source = ls2, up_branch = self.branch) | ||
180 | |||
181 | # expect two layer versions, in the priority order | ||
182 | equivalent_list = self.project.compatible_layerversions() | ||
183 | self.assertTrue(len(equivalent_list) == 2) | ||
184 | self.assertTrue(equivalent_list[0] == self.layerversion2) | ||
185 | self.assertTrue(equivalent_list[1] == self.lver) | ||