From bc9c61ea8fc1df9a2c356582e1a3defaf30a8b9b Mon Sep 17 00:00:00 2001 From: Diane Trout Date: Wed, 22 Feb 2017 15:45:00 -0800 Subject: [PATCH] Set sort order on Lanes model. I was enforcing a sort order one one way to retrieve lanes but not the other, which ment my tests depended on the database default return order. This then impacted another test of 'expected' results which needed to be updated. --- experiments/experiments.py | 2 +- experiments/models.py | 3 +++ experiments/test_experiments.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/experiments/experiments.py b/experiments/experiments.py index b443a4d..29b0cc1 100644 --- a/experiments/experiments.py +++ b/experiments/experiments.py @@ -96,7 +96,7 @@ def lanes_for(username=None): user = HTSUser.objects.get(username=username) query.update({'library__affiliations__users__id': user.id}) - lanes = Lane.objects.filter(**query).order_by('-flowcell__run_date') + lanes = Lane.objects.filter(**query) result = [] for l in lanes: diff --git a/experiments/models.py b/experiments/models.py index b7fc5b8..822a29b 100644 --- a/experiments/models.py +++ b/experiments/models.py @@ -284,6 +284,9 @@ def is_valid_lane(value): class Lane(models.Model): + class Meta: + ordering = ['-flowcell__run_date', '-library__id'] + flowcell = models.ForeignKey(FlowCell) lane_number = models.IntegerField() library = models.ForeignKey(Library) diff --git a/experiments/test_experiments.py b/experiments/test_experiments.py index 9dc1933..d6344c9 100644 --- a/experiments/test_experiments.py +++ b/experiments/test_experiments.py @@ -195,7 +195,7 @@ class ExperimentsTestCases(TestCase): library id field matches the library id looked up. """ - expected_ids = ['1215{}'.format(i) for i in range(1, 9)] + expected_ids = ['1215{}'.format(i) for i in range(8, 0, -1)] self.assertTrue(self.client.login(username=self.admin.username, password=self.password)) response = self.client.get( '/admin/experiments/flowcell/{}/change/'.format(self.fc12150.id), -- 2.30.2