diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-07-21 14:43:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-26 08:10:36 +0100 |
commit | bb260e94a63d6d498c9c76b862bc836a90678495 (patch) | |
tree | 9fe719213c79a999e5d5eb7e4c28da926c56db6f /bitbake/lib/toaster/toastergui | |
parent | ef627d0ab8f5cf2fc72005393e76047cb623ff3d (diff) | |
download | poky-bb260e94a63d6d498c9c76b862bc836a90678495.tar.gz |
bitbake: toaster: tests: Remove references to LayerSource model
Remove and replace layersource model references in the tests and test
data. Remove the orm/test as this only tested LayerSource interactions
which have now been removed.
(Bitbake rev: 61a47cbc92c856690cb0e8da7102b2e669eaee0a)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
-rw-r--r-- | bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml | 39 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/tests.py | 3 |
2 files changed, 1 insertions, 41 deletions
diff --git a/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml b/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml index 213bf0f675..80c1e19dda 100644 --- a/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml +++ b/bitbake/lib/toaster/toastergui/fixtures/toastergui-unittest-data.xml | |||
@@ -195,8 +195,6 @@ | |||
195 | <field to="orm.customimagerecipe" name="recipe_appends" rel="ManyToManyRel"><object pk="3"></object></field> | 195 | <field to="orm.customimagerecipe" name="recipe_appends" rel="ManyToManyRel"><object pk="3"></object></field> |
196 | </object> | 196 | </object> |
197 | <object pk="1" model="orm.recipe"> | 197 | <object pk="1" model="orm.recipe"> |
198 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
199 | <field type="IntegerField" name="up_id"><None></None></field> | ||
200 | <field type="DateTimeField" name="up_date"><None></None></field> | 198 | <field type="DateTimeField" name="up_date"><None></None></field> |
201 | <field type="CharField" name="name">z recipe</field> | 199 | <field type="CharField" name="name">z recipe</field> |
202 | <field type="CharField" name="version">5.2</field> | 200 | <field type="CharField" name="version">5.2</field> |
@@ -212,8 +210,6 @@ | |||
212 | <field type="BooleanField" name="is_image">False</field> | 210 | <field type="BooleanField" name="is_image">False</field> |
213 | </object> | 211 | </object> |
214 | <object pk="2" model="orm.recipe"> | 212 | <object pk="2" model="orm.recipe"> |
215 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
216 | <field type="IntegerField" name="up_id"><None></None></field> | ||
217 | <field type="DateTimeField" name="up_date"><None></None></field> | 213 | <field type="DateTimeField" name="up_date"><None></None></field> |
218 | <field type="CharField" name="name">a recipe</field> | 214 | <field type="CharField" name="name">a recipe</field> |
219 | <field type="CharField" name="version">1.2</field> | 215 | <field type="CharField" name="version">1.2</field> |
@@ -229,8 +225,6 @@ | |||
229 | <field type="BooleanField" name="is_image">False</field> | 225 | <field type="BooleanField" name="is_image">False</field> |
230 | </object> | 226 | </object> |
231 | <object pk="3" model="orm.recipe"> | 227 | <object pk="3" model="orm.recipe"> |
232 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel"><None></None></field> | ||
233 | <field type="IntegerField" name="up_id"><None></None></field> | ||
234 | <field type="DateTimeField" name="up_date"><None></None></field> | 228 | <field type="DateTimeField" name="up_date"><None></None></field> |
235 | <field type="CharField" name="name">a custom recipe</field> | 229 | <field type="CharField" name="name">a custom recipe</field> |
236 | <field type="CharField" name="version"></field> | 230 | <field type="CharField" name="version"></field> |
@@ -246,8 +240,6 @@ | |||
246 | <field type="BooleanField" name="is_image">False</field> | 240 | <field type="BooleanField" name="is_image">False</field> |
247 | </object> | 241 | </object> |
248 | <object pk="4" model="orm.recipe"> | 242 | <object pk="4" model="orm.recipe"> |
249 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
250 | <field type="IntegerField" name="up_id"><None></None></field> | ||
251 | <field type="DateTimeField" name="up_date"><None></None></field> | 243 | <field type="DateTimeField" name="up_date"><None></None></field> |
252 | <field type="CharField" name="name">a image recipe</field> | 244 | <field type="CharField" name="name">a image recipe</field> |
253 | <field type="CharField" name="version">1.2</field> | 245 | <field type="CharField" name="version">1.2</field> |
@@ -263,8 +255,6 @@ | |||
263 | <field type="BooleanField" name="is_image">True</field> | 255 | <field type="BooleanField" name="is_image">True</field> |
264 | </object> | 256 | </object> |
265 | <object pk="5" model="orm.recipe"> | 257 | <object pk="5" model="orm.recipe"> |
266 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
267 | <field type="IntegerField" name="up_id"><None></None></field> | ||
268 | <field type="DateTimeField" name="up_date"><None></None></field> | 258 | <field type="DateTimeField" name="up_date"><None></None></field> |
269 | <field type="CharField" name="name">z image recipe</field> | 259 | <field type="CharField" name="name">z image recipe</field> |
270 | <field type="CharField" name="version">1.3</field> | 260 | <field type="CharField" name="version">1.3</field> |
@@ -280,8 +270,6 @@ | |||
280 | <field type="BooleanField" name="is_image">True</field> | 270 | <field type="BooleanField" name="is_image">True</field> |
281 | </object> | 271 | </object> |
282 | <object pk="6" model="orm.recipe"> | 272 | <object pk="6" model="orm.recipe"> |
283 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel"><None></None></field> | ||
284 | <field type="IntegerField" name="up_id"><None></None></field> | ||
285 | <field type="DateTimeField" name="up_date"><None></None></field> | 273 | <field type="DateTimeField" name="up_date"><None></None></field> |
286 | <field type="CharField" name="name">z custom recipe</field> | 274 | <field type="CharField" name="name">z custom recipe</field> |
287 | <field type="CharField" name="version"></field> | 275 | <field type="CharField" name="version"></field> |
@@ -307,34 +295,23 @@ | |||
307 | </object> | 295 | </object> |
308 | 296 | ||
309 | <object pk="1" model="orm.machine"> | 297 | <object pk="1" model="orm.machine"> |
310 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel"><None></None></field> | ||
311 | <field type="IntegerField" name="up_id"><None></None></field> | ||
312 | <field type="DateTimeField" name="up_date"><None></None></field> | 298 | <field type="DateTimeField" name="up_date"><None></None></field> |
313 | <field to="orm.layer_version" name="layer_version" rel="ManyToOneRel">1</field> | 299 | <field to="orm.layer_version" name="layer_version" rel="ManyToOneRel">1</field> |
314 | <field type="CharField" name="name">a machine</field> | 300 | <field type="CharField" name="name">a machine</field> |
315 | <field type="CharField" name="description">a machine</field> | 301 | <field type="CharField" name="description">a machine</field> |
316 | </object> | 302 | </object> |
317 | <object pk="2" model="orm.machine"> | 303 | <object pk="2" model="orm.machine"> |
318 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel"><None></None></field> | ||
319 | <field type="IntegerField" name="up_id"><None></None></field> | ||
320 | <field type="DateTimeField" name="up_date"><None></None></field> | 304 | <field type="DateTimeField" name="up_date"><None></None></field> |
321 | <field to="orm.layer_version" name="layer_version" rel="ManyToOneRel">2</field> | 305 | <field to="orm.layer_version" name="layer_version" rel="ManyToOneRel">2</field> |
322 | <field type="CharField" name="name">z machine</field> | 306 | <field type="CharField" name="name">z machine</field> |
323 | <field type="CharField" name="description">z machine</field> | 307 | <field type="CharField" name="description">z machine</field> |
324 | </object> | 308 | </object> |
325 | <object pk="3" model="orm.machine"> | 309 | <object pk="3" model="orm.machine"> |
326 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel"><None></None></field> | ||
327 | <field type="IntegerField" name="up_id"><None></None></field> | ||
328 | <field type="DateTimeField" name="up_date"><None></None></field> | 310 | <field type="DateTimeField" name="up_date"><None></None></field> |
329 | <field to="orm.layer_version" name="layer_version" rel="ManyToOneRel">1</field> | 311 | <field to="orm.layer_version" name="layer_version" rel="ManyToOneRel">1</field> |
330 | <field type="CharField" name="name">g machine</field> | 312 | <field type="CharField" name="name">g machine</field> |
331 | <field type="CharField" name="description">g machine</field> | 313 | <field type="CharField" name="description">g machine</field> |
332 | </object> | 314 | </object> |
333 | <object pk="1" model="orm.layersource"> | ||
334 | <field type="CharField" name="name">local</field> | ||
335 | <field type="IntegerField" name="sourcetype">1</field> | ||
336 | <field type="CharField" name="apiurl"></field> | ||
337 | </object> | ||
338 | <object pk="1" model="orm.bitbakeversion"> | 315 | <object pk="1" model="orm.bitbakeversion"> |
339 | <field type="CharField" name="name">test bbv</field> | 316 | <field type="CharField" name="name">test bbv</field> |
340 | <field type="CharField" name="giturl">/tmp/</field> | 317 | <field type="CharField" name="giturl">/tmp/</field> |
@@ -355,26 +332,16 @@ | |||
355 | <field type="CharField" name="branch_name">master</field> | 332 | <field type="CharField" name="branch_name">master</field> |
356 | <field type="TextField" name="helptext"><None></None></field> | 333 | <field type="TextField" name="helptext"><None></None></field> |
357 | </object> | 334 | </object> |
358 | <object pk="1" model="orm.releaselayersourcepriority"> | ||
359 | <field to="orm.release" name="release" rel="ManyToOneRel">1</field> | ||
360 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
361 | <field type="IntegerField" name="priority">0</field> | ||
362 | </object> | ||
363 | <object pk="1" model="orm.branch"> | 335 | <object pk="1" model="orm.branch"> |
364 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
365 | <field type="CharField" name="name">master</field> | 336 | <field type="CharField" name="name">master</field> |
366 | <field type="CharField" name="short_description"></field> | 337 | <field type="CharField" name="short_description"></field> |
367 | </object> | 338 | </object> |
368 | <object pk="1" model="orm.layer"> | 339 | <object pk="1" model="orm.layer"> |
369 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel"><None></None></field> | ||
370 | <field type="IntegerField" name="up_id"><None></None></field> | ||
371 | <field type="DateTimeField" name="up_date"><None></None></field> | 340 | <field type="DateTimeField" name="up_date"><None></None></field> |
372 | <field type="CharField" name="name">a layer</field> | 341 | <field type="CharField" name="name">a layer</field> |
373 | <field type="CharField" name="vcs_url">/tmp/</field> | 342 | <field type="CharField" name="vcs_url">/tmp/</field> |
374 | </object> | 343 | </object> |
375 | <object pk="2" model="orm.layer"> | 344 | <object pk="2" model="orm.layer"> |
376 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
377 | <field type="IntegerField" name="up_id"><None></None></field> | ||
378 | <field type="DateTimeField" name="up_date"><None></None></field> | 345 | <field type="DateTimeField" name="up_date"><None></None></field> |
379 | <field type="CharField" name="name">z layer</field> | 346 | <field type="CharField" name="name">z layer</field> |
380 | <field type="CharField" name="layer_index_url"></field> | 347 | <field type="CharField" name="layer_index_url"></field> |
@@ -383,8 +350,6 @@ | |||
383 | <object pk="1" model="orm.layer_version"> | 350 | <object pk="1" model="orm.layer_version"> |
384 | <field to="orm.build" name="build" rel="ManyToOneRel">1</field> | 351 | <field to="orm.build" name="build" rel="ManyToOneRel">1</field> |
385 | <field to="orm.layer" name="layer" rel="ManyToOneRel">1</field> | 352 | <field to="orm.layer" name="layer" rel="ManyToOneRel">1</field> |
386 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
387 | <field type="IntegerField" name="up_id"><None></None></field> | ||
388 | <field type="DateTimeField" name="up_date"><None></None></field> | 353 | <field type="DateTimeField" name="up_date"><None></None></field> |
389 | <field to="orm.branch" name="up_branch" rel="ManyToOneRel">1</field> | 354 | <field to="orm.branch" name="up_branch" rel="ManyToOneRel">1</field> |
390 | <field type="CharField" name="branch">master</field> | 355 | <field type="CharField" name="branch">master</field> |
@@ -397,8 +362,6 @@ | |||
397 | <object pk="2" model="orm.layer_version"> | 362 | <object pk="2" model="orm.layer_version"> |
398 | <field to="orm.build" name="build" rel="ManyToOneRel"><None></None></field> | 363 | <field to="orm.build" name="build" rel="ManyToOneRel"><None></None></field> |
399 | <field to="orm.layer" name="layer" rel="ManyToOneRel">2</field> | 364 | <field to="orm.layer" name="layer" rel="ManyToOneRel">2</field> |
400 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
401 | <field type="IntegerField" name="up_id"><None></None></field> | ||
402 | <field type="DateTimeField" name="up_date"><None></None></field> | 365 | <field type="DateTimeField" name="up_date"><None></None></field> |
403 | <field to="orm.branch" name="up_branch" rel="ManyToOneRel">1</field> | 366 | <field to="orm.branch" name="up_branch" rel="ManyToOneRel">1</field> |
404 | <field type="CharField" name="branch">testing-branch</field> | 367 | <field type="CharField" name="branch">testing-branch</field> |
@@ -411,8 +374,6 @@ | |||
411 | <object pk="3" model="orm.layer_version"> | 374 | <object pk="3" model="orm.layer_version"> |
412 | <field to="orm.build" name="build" rel="ManyToOneRel">1</field> | 375 | <field to="orm.build" name="build" rel="ManyToOneRel">1</field> |
413 | <field to="orm.layer" name="layer" rel="ManyToOneRel">2</field> | 376 | <field to="orm.layer" name="layer" rel="ManyToOneRel">2</field> |
414 | <field to="orm.layersource" name="layer_source" rel="ManyToOneRel">1</field> | ||
415 | <field type="IntegerField" name="up_id"><None></None></field> | ||
416 | <field type="DateTimeField" name="up_date"><None></None></field> | 377 | <field type="DateTimeField" name="up_date"><None></None></field> |
417 | <field to="orm.branch" name="up_branch" rel="ManyToOneRel">1</field> | 378 | <field to="orm.branch" name="up_branch" rel="ManyToOneRel">1</field> |
418 | <field type="CharField" name="branch">testing-branch</field> | 379 | <field type="CharField" name="branch">testing-branch</field> |
diff --git a/bitbake/lib/toaster/toastergui/tests.py b/bitbake/lib/toaster/toastergui/tests.py index da530a10e5..03b73a9d69 100644 --- a/bitbake/lib/toaster/toastergui/tests.py +++ b/bitbake/lib/toaster/toastergui/tests.py | |||
@@ -28,7 +28,7 @@ from django.utils import timezone | |||
28 | from django.db.models import Q | 28 | from django.db.models import Q |
29 | 29 | ||
30 | from orm.models import Project, Release, BitbakeVersion, Package, LogMessage | 30 | from orm.models import Project, Release, BitbakeVersion, Package, LogMessage |
31 | from orm.models import ReleaseLayerSourcePriority, LayerSource, Layer, Build | 31 | from orm.models import LayerSource, Layer, Build |
32 | from orm.models import Layer_Version, Recipe, Machine, ProjectLayer, Target | 32 | from orm.models import Layer_Version, Recipe, Machine, ProjectLayer, Target |
33 | from orm.models import CustomImageRecipe, ProjectVariable | 33 | from orm.models import CustomImageRecipe, ProjectVariable |
34 | from orm.models import Branch, CustomImagePackage | 34 | from orm.models import Branch, CustomImagePackage |
@@ -149,7 +149,6 @@ class ViewTests(TestCase): | |||
149 | 149 | ||
150 | def test_xhr_import_layer(self): | 150 | def test_xhr_import_layer(self): |
151 | """Test xhr_importlayer API""" | 151 | """Test xhr_importlayer API""" |
152 | LayerSource.objects.create(sourcetype=LayerSource.TYPE_IMPORTED) | ||
153 | #Test for importing an already existing layer | 152 | #Test for importing an already existing layer |
154 | args = {'vcs_url' : "git://git.example.com/test", | 153 | args = {'vcs_url' : "git://git.example.com/test", |
155 | 'name' : "base-layer", | 154 | 'name' : "base-layer", |