From 552b1feeef678c0eaa35917a374666bcfb0d4ff7 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Mon, 10 Aug 2015 12:21:30 +0100 Subject: 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 Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/tests.py | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'bitbake/lib/toaster/orm') 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): self.assertTrue(len(compatible_layerversions) == 1) self.assertTrue(compatible_layerversions[0] == self.lver) - - def test_dual_layersource(self): - # 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 - ls2 = LayerSource.objects.create(name = "dummy-layersource2", sourcetype = LayerSource.TYPE_LOCAL, apiurl="testing") - - # assign a lower priority for the second layer source - Release.objects.get(name="default-release").releaselayersourcepriority_set.create(layer_source = ls2, priority = 2) - - # create a new layer_version for a layer with the same name coming from the second layer source - self.layer2 = Layer.objects.create(name="meta-testlayer", layer_source = ls2) - self.layerversion2 = Layer_Version.objects.create(layer = self.layer2, layer_source = ls2, up_branch = self.branch) - - # expect two layer versions, in the priority order - equivalent_list = self.project.compatible_layerversions() - self.assertTrue(len(equivalent_list) == 2) - self.assertTrue(equivalent_list[0] == self.layerversion2) - self.assertTrue(equivalent_list[1] == self.lver) -- cgit v1.2.3-54-g00ecf