diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-08-10 12:21:34 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-17 14:41:45 +0100 |
commit | c348fa50186fb0796bc7b793c4b8d710419f2a0d (patch) | |
tree | 3801f011aec67c1006faa743b4aa79955f2416ef /bitbake | |
parent | e5956a6b850f75e65a76180fc7a568553072d36d (diff) | |
download | openembedded-core-contrib-c348fa50186fb0796bc7b793c4b8d710419f2a0d.tar.gz |
bitbake: toaster: move code from setup_lv_tests to setUp
As ProjectLVSelectionTestCase was removed there is no point
to keep this function. Moved code back to setUp method.
(Bitbake rev: 8e9bd559c8ef0ebc9e8babbada06e710908bae08)
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')
-rw-r--r-- | bitbake/lib/toaster/orm/tests.py | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/bitbake/lib/toaster/orm/tests.py b/bitbake/lib/toaster/orm/tests.py index 5246909ae5..783aea890f 100644 --- a/bitbake/lib/toaster/orm/tests.py +++ b/bitbake/lib/toaster/orm/tests.py @@ -81,40 +81,37 @@ class LILSUpdateTestCase(TransactionTestCase): self.assertTrue(lsobj.branch_set.all().count() > 0, "no branches fetched") - -def setup_lv_tests(self): - """Create required objects.""" - # create layer source - self.lsrc = LayerSource.objects.create(name="dummy-layersource", - sourcetype=LayerSource.TYPE_LOCAL) - # create release - bbv = BitbakeVersion.objects.create(\ - name="master", giturl="git://git.openembedded.org/bitbake") - self.release = Release.objects.create(name="default-release", - bitbake_version=bbv, - branch_name="master") - # attach layer source to release - ReleaseLayerSourcePriority.objects.create(\ - release=self.release, layer_source=self.lsrc, priority=1) - - # create a layer version for the layer on the specified branch - self.layer = Layer.objects.create(name="meta-testlayer", - layer_source=self.lsrc) - self.branch = Branch.objects.create(name="master", layer_source=self.lsrc) - self.lver = Layer_Version.objects.create(\ - layer=self.layer, layer_source=self.lsrc, up_branch=self.branch) - - # create project and project layer - self.project = Project.objects.create_project(name="test-project", - release=self.release) - ProjectLayer.objects.create(project=self.project, - layercommit=self.lver) - class LayerVersionEquivalenceTestCase(TestCase): """Verify Layer_Version priority selection.""" def setUp(self): - setup_lv_tests(self) + """Create required objects.""" + # create layer source + self.lsrc = LayerSource.objects.create(name="dummy-layersource", + sourcetype=LayerSource.TYPE_LOCAL) + # create release + bbv = BitbakeVersion.objects.create(\ + name="master", giturl="git://git.openembedded.org/bitbake") + self.release = Release.objects.create(name="default-release", + bitbake_version=bbv, + branch_name="master") + # attach layer source to release + ReleaseLayerSourcePriority.objects.create(\ + release=self.release, layer_source=self.lsrc, priority=1) + + # create a layer version for the layer on the specified branch + self.layer = Layer.objects.create(name="meta-testlayer", + layer_source=self.lsrc) + self.branch = Branch.objects.create(name="master", layer_source=self.lsrc) + self.lver = Layer_Version.objects.create(\ + layer=self.layer, layer_source=self.lsrc, up_branch=self.branch) + + # create project and project layer + self.project = Project.objects.create_project(name="test-project", + release=self.release) + ProjectLayer.objects.create(project=self.project, + layercommit=self.lver) + # create spoof layer that should not appear in the search results layer = Layer.objects.create(name="meta-notvalid", layer_source=self.lsrc) |