Skip to content

Commit ca04746

Browse files
committed
fix test warnings
1 parent 03d7c3d commit ca04746

File tree

8 files changed

+21
-3
lines changed

8 files changed

+21
-3
lines changed

arch/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class Architecture(models.Model):
2424

2525
class Meta:
2626
abstract = True
27+
ordering = ['name']
2728

2829
def __str__(self):
2930
return self.name

domains/models.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,8 @@ class Domain(models.Model):
2222

2323
name = models.CharField(max_length=255, unique=True)
2424

25+
class Meta:
26+
ordering = ['name']
27+
2528
def __str__(self):
2629
return self.name

errata/tests/test_integration.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# along with Patchman. If not, see <http://www.gnu.org/licenses/>
1616

1717
from django.test import TestCase, override_settings
18+
from django.utils import timezone
1819

1920
from errata.models import Erratum
2021
from operatingsystems.models import OSRelease
@@ -37,7 +38,7 @@ def test_erratum_with_cves(self):
3738
name='RHSA-2024:1234',
3839
e_type='Security Advisory',
3940
synopsis='Important: curl security update',
40-
issue_date='2024-03-15',
41+
issue_date=timezone.now(),
4142
)
4243
erratum.cves.add(cve1, cve2)
4344

@@ -54,7 +55,7 @@ def test_erratum_with_osreleases(self):
5455
name='RHSA-2024:1235',
5556
e_type='Security Advisory',
5657
synopsis='Important: openssl security update',
57-
issue_date='2024-03-16',
58+
issue_date=timezone.now(),
5859
)
5960
erratum.osreleases.add(osrelease1, osrelease2)
6061

@@ -66,7 +67,7 @@ def test_erratum_with_packages(self):
6667
name='RHSA-2024:1236',
6768
e_type='Bug Fix',
6869
synopsis='Bug fix: httpd update',
69-
issue_date='2024-03-17',
70+
issue_date=timezone.now(),
7071
)
7172

7273
# Verify erratum can store package references

etc/patchman/local_settings.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,7 @@
111111
'loggers': {
112112
'urllib3': {'level': 'WARNING', 'handlers': ['console'], 'propagate': False},
113113
'git': {'level': 'WARNING', 'handlers': ['console'], 'propagate': False},
114+
'version_utils': {'level': 'WARNING', 'handlers': ['console'], 'propagate': False},
115+
'celery': {'level': 'WARNING', 'handlers': ['console'], 'propagate': False},
114116
}
115117
}

hosts/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ class HostRepo(models.Model):
352352

353353
class Meta:
354354
unique_together = ['host', 'repo']
355+
ordering = ['host', 'repo']
355356

356357
def __str__(self):
357358
return f'{self.host}-{self.repo}'

packages/models.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ class PackageUpdate(models.Model):
227227

228228
class Meta:
229229
unique_together = ['oldpackage', 'newpackage', 'security']
230+
ordering = ['oldpackage', 'newpackage']
230231

231232
def __str__(self):
232233
if self.security:

repos/models.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ class Repository(models.Model):
5656
class Meta:
5757
verbose_name_plural = 'Repository'
5858
verbose_name_plural = 'Repositories'
59+
ordering = ['name']
5960

6061
def __str__(self):
6162
return self.name
@@ -154,6 +155,7 @@ class Mirror(models.Model):
154155
class Meta:
155156
verbose_name_plural = 'Mirror'
156157
verbose_name_plural = 'Mirrors'
158+
ordering = ['url']
157159

158160
def __str__(self):
159161
return self.url
@@ -203,3 +205,6 @@ class MirrorPackage(models.Model):
203205
mirror = models.ForeignKey(Mirror, on_delete=models.CASCADE)
204206
package = models.ForeignKey(Package, on_delete=models.CASCADE)
205207
enabled = models.BooleanField(default=True)
208+
209+
class Meta:
210+
ordering = ['mirror', 'package']

security/models.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class Reference(models.Model):
3333

3434
class Meta:
3535
unique_together = ['ref_type', 'url']
36+
ordering = ['ref_type', 'url']
3637

3738
def __str__(self):
3839
return self.url
@@ -44,6 +45,9 @@ class CWE(models.Model):
4445
name = models.CharField(max_length=255, blank=True, null=True)
4546
description = models.TextField(blank=True, default='')
4647

48+
class Meta:
49+
ordering = ['cwe_id']
50+
4751
def __str__(self):
4852
return f'{self.cwe_id} - {self.name}'
4953

0 commit comments

Comments
 (0)