From 0fb6be01feac7e4d63cb3696bf2d182b3e85bbca Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 2 Oct 2015 11:05:15 -0700 Subject: bitbake: toaster: fix orm tests Cleaned up and fixed orm tests. Removed test_build_layerversion as it's not needed due to changed compatible_layer_versions API. (Bitbake rev: 73ea29ed065bfaa80ee368b2a38c157e36fe1676) Signed-off-by: Ed Bartosh Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/tests.py | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/orm/tests.py b/bitbake/lib/toaster/orm/tests.py index 783aea890f..c30f99a3af 100644 --- a/bitbake/lib/toaster/orm/tests.py +++ b/bitbake/lib/toaster/orm/tests.py @@ -25,10 +25,9 @@ from django.test import TestCase, TransactionTestCase from orm.models import LocalLayerSource, LayerIndexLayerSource, ImportedLayerSource, LayerSource from orm.models import Branch -from orm.models import Project, Build, Layer, Layer_Version, Branch, ProjectLayer +from orm.models import Project, Layer, Layer_Version, Branch, ProjectLayer from orm.models import Release, ReleaseLayerSourcePriority, BitbakeVersion -from django.utils import timezone from django.db import IntegrityError import os @@ -153,35 +152,11 @@ class LayerVersionEquivalenceTestCase(TestCase): equivqs = self.lver.get_equivalents_wpriority(self.project) self.assertEqual(list(equivqs), [lver2, self.lver]) - def test_build_layerversion(self): + def test_compatible_layer_versions(self): """ - Any layer version coming from the build should show up - before any layer version coming from upstream - """ - build = Build.objects.create(project=self.project, - started_on=timezone.now(), - completed_on=timezone.now()) - lvb = Layer_Version.objects.create(layer=self.layer, build=build, - commit="deadbeef") - - # a build layerversion must be in the equivalence - # list for the original layerversion - equivqs = self.lver.get_equivalents_wpriority(self.project) - self.assertTrue(len(equivqs) == 2) - self.assertTrue(equivqs[0] == self.lver) - self.assertTrue(equivqs[1] == lvb) - - # getting the build layerversion equivalent list must - # return the same list as the original layer - bequivqs = lvb.get_equivalents_wpriority(self.project) - - self.assertEqual(list(equivqs), list(bequivqs)) - - def test_compatible_layerversions(self): - """ - When we have a 2 layer versions, compatible_layerversions() + When we have a 2 layer versions, get_all_compatible_layerversions() should return a queryset with both. """ - compat_lv = self.project.compatible_layerversions() + compat_lv = self.project.get_all_compatible_layer_versions() self.assertEqual(list(compat_lv), [self.lver, self.lver2]) -- cgit v1.2.3-54-g00ecf