Merge lp:~allenap/maas/finding-something-that-should-not-be-there--bug-1659244 into lp:~maas-committers/maas/trunk

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 5663
Proposed branch: lp:~allenap/maas/finding-something-that-should-not-be-there--bug-1659244
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 27 lines (+4/-2)
1 file modified
src/maasserver/api/tests/test_packagerepositories.py (+4/-2)
To merge this branch: bzr merge lp:~allenap/maas/finding-something-that-should-not-be-there--bug-1659244
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+315552@code.launchpad.net

Commit message

Fix a couple of spuriously failing tests.

They had been assuming an empty database, but tests now run in a fully-migrated database which happens to contain a couple of package repositories. A non-existing repository ID was being chosen at random but about 2% of the time it did exist.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/api/tests/test_packagerepositories.py'
2--- src/maasserver/api/tests/test_packagerepositories.py 2017-01-11 15:24:56 +0000
3+++ src/maasserver/api/tests/test_packagerepositories.py 2017-01-25 10:41:02 +0000
4@@ -65,9 +65,10 @@
5 parsed_package_repository.keys())
6
7 def test_read_404_when_bad_id(self):
8+ most_recent_repo = PackageRepository.objects.latest("id")
9 response = self.client.get(
10 reverse(
11- 'package_repository_handler', args=[random.randint(0, 100)]))
12+ 'package_repository_handler', args=[most_recent_repo.id + 1]))
13 self.assertEqual(
14 http.client.NOT_FOUND, response.status_code, response.content)
15
16@@ -120,10 +121,11 @@
17 self.assertIsNotNone(reload_object(package_repository))
18
19 def test_delete_404_when_invalid_id(self):
20+ most_recent_repo = PackageRepository.objects.latest("id")
21 self.become_admin()
22 response = self.client.delete(
23 reverse(
24- 'package_repository_handler', args=[random.randint(0, 100)]))
25+ 'package_repository_handler', args=[most_recent_repo.id + 1]))
26 self.assertEqual(
27 http.client.NOT_FOUND, response.status_code, response.content)
28