← Back to branch summary

~ubuntu-branches/ubuntu/raring/maas/raring-updates

« back to all changes in this revision

Viewing changes to src/maasserver/tests/models.py

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2012-07-03 17:42:37 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20120703174237-p8l0keuuznfg721k
Tags: 0.1+bzr709+dfsg-0ubuntu1
* New Upstream release
* debian/control:
  - Depends on python-celery, python-tempita, libjs-yui3-{full,min},
    libjs-raphael
* debian/maas.install:
  - Install apiclient, celeryconfig.py, maas-import-pxe-files, preseeds_v2.
  - Update to install various files from chroot, rather tha manually copy
    them from the source.
* debian/maas.links: symlink celeryconfig.py
* debian/maas.maas-celery.upstart: Add job.
* debian/rules:
  - Install celery upstart job.
  - Do not install jslibs as packages are now used.
  - Drop copying of maas_local_settings_sample.py as source now ships
    a maas_local_settings.py
* debian/patches:
  - 04-maas-http-fix.patch: Drop. Merged upstream.
  - 01-fix-database-settings.patch: Refreshed.
  - 99_enums_js.patch: Added until creation of enum.js / build process
    is fixed.
* debian/maas.postinst: Update bzr version to correctly handle upgrades.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/tests/models.py
14
14
    'JSONFieldModel',
15
15
    ]
16
16
 
17
 
from django.db import models
 
17
from django.db.models import (
 
18
    CharField,
 
19
    Model,
 
20
    )
18
21
from maasserver.fields import JSONObjectField
19
 
 
20
 
 
21
 
class JSONFieldModel(models.Model):
22
 
    name = models.CharField(max_length=255, unique=False)
 
22
from maasserver.models.timestampedmodel import TimestampedModel
 
23
 
 
24
 
 
25
class JSONFieldModel(Model):
 
26
    name = CharField(max_length=255, unique=False)
23
27
    value = JSONObjectField(null=True)
24
28
 
25
29
 
26
 
class MessagesTestModel(models.Model):
27
 
    name = models.CharField(max_length=255, unique=False)
 
30
class MessagesTestModel(Model):
 
31
    name = CharField(max_length=255, unique=False)
 
32
 
 
33
 
 
34
class TimestampedModelTestModel(TimestampedModel):
 
35
    # This model inherits from TimestampedModel so it will have a 'created'
 
36
    # field and an 'updated' field.
 
37
    pass