thermokarst/ccdb-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TST: Travis/Coveralls setup (#10)

Browse source 
- add travis.yml
- linting
- coveralls
- readme
This commit is contained in:
Matthew Ryan Dillon 2016-08-28 16:30:20 -07:00
parent 8622e2323d
commit 983ce6f021
15 changed files with 107 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ccdb/misc/models.py
View file

@ -21,9 +21,12 @@ class MeasurementType(models.Model):
code = models.CharField(max_length=10, blank=True)
measurement_type_class = models.CharField(max_length=50, blank=True)
description = models.CharField(max_length=255, blank=True)
default_measurement_unit = models.ForeignKey('MeasurementUnit', blank=True,
null=True,
related_name='measurement_types')
default_measurement_unit = models.ForeignKey(
'MeasurementUnit',
blank=True,
null=True,
related_name='measurement_types'
)
sort_order = models.IntegerField(blank=True, null=True)
def __str__(self):
@ -72,8 +75,8 @@ class Container(models.Model):
material = models.ForeignKey(Material, blank=True, null=True,
related_name='containers')
volume = models.FloatField(blank=True, null=True)
measurement_unit = models.ForeignKey(MeasurementUnit, blank=True, null=True,
related_name='containers')
measurement_unit = models.ForeignKey(MeasurementUnit, blank=True,
null=True, related_name='containers')
sort_order = models.IntegerField(blank=True, null=True)
def __str__(self):

10
ccdb/misc/tests/test_models.py
View file

@ -30,8 +30,11 @@ class MeasurementTypeTestCase(TestCase):
def test_uniqueness(self):
m1 = MeasurementTypeFactory()
with transaction.atomic(), self.assertRaises(IntegrityError):
MeasurementTypeFactory(name=m1.name, code=m1.code,
measurement_type_class=m1.measurement_type_class)
MeasurementTypeFactory(
name=m1.name,
code=m1.code,
measurement_type_class=m1.measurement_type_class
)
m3 = MeasurementTypeFactory()
self.assertTrue(isinstance(m3, MeasurementType))
@ -59,7 +62,8 @@ class ColorTestCase(TestCase):
def test_uniqueness(self):
c1 = ColorFactory()
with transaction.atomic(), self.assertRaises(IntegrityError):
ColorFactory(name=c1.name, code=c1.code, color_number=c1.color_number)
ColorFactory(name=c1.name, code=c1.code,
color_number=c1.color_number)
c3 = ColorFactory()
self.assertTrue(isinstance(c3, Color))