isitdeployable

Merge lp:~roadmr/isitdeployable/active-flag into lp:isitdeployable

  1. active-flag
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Approved by: Daniel Manrique
Approved revision: 303
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~roadmr/isitdeployable/active-flag
Merge into: lp:isitdeployable
Diff against target: 45 lines (+7/-6)
3 files modified
revtracker/models.py (+1/-4)
revtracker/tests/test_models.py (+1/-1)
revtracker/tests/test_tasks.py (+5/-1)
To merge this branch: bzr merge lp:~roadmr/isitdeployable/active-flag
Reviewer Review Type Date Requested Status
Jonathan Hartley (community) Approve
Review via email: mp+372562@code.launchpad.net

Commit message

Fixes from the previous merge

Description of the change

Sorry!!! I approved the previous MP for this branch without pushing the promised changes. Here they are.

To post a comment you must log in.
Revision history for this message
Jonathan Hartley (tartley) wrote :

fabulous, approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'revtracker/models.py'
2--- revtracker/models.py 2019-09-06 22:15:47 +0000
3+++ revtracker/models.py 2019-09-10 18:42:51 +0000
4@@ -25,10 +25,7 @@
5 ordering = ['name']
6
7 def __unicode__(self):
8- return u"Project %s (%s)" % (self.name, self.active_status())
9-
10- def active_status(self):
11- return "active" if self.active else "inactive"
12+ return u"Project %s%s" % (self.name, " (inactive)" if not self.active else "")
13
14
15 class RevisionManager(models.Manager):
16
17=== modified file 'revtracker/tests/test_models.py'
18--- revtracker/tests/test_models.py 2019-09-06 22:15:47 +0000
19+++ revtracker/tests/test_models.py 2019-09-10 18:42:51 +0000
20@@ -34,7 +34,7 @@
21
22 def test_active_project_unicode(self):
23 depl = self.factory.make_project(name='myproject', active=True)
24- self.assertEqual(str(depl), "Project myproject (active)")
25+ self.assertEqual(str(depl), "Project myproject")
26
27 def test_inactive_project_unicode(self):
28 depl = self.factory.make_project(name='myproject', active=False)
29
30=== modified file 'revtracker/tests/test_tasks.py'
31--- revtracker/tests/test_tasks.py 2019-09-06 22:15:47 +0000
32+++ revtracker/tests/test_tasks.py 2019-09-10 18:42:51 +0000
33@@ -817,7 +817,11 @@
34 mock_response = mock.Mock()
35 mock_response.headers = {version_header: expected_version}
36
37- with mock.patch('revtracker.tasks.requests') as mock_requests, mock.patch('revtracker.tasks.now') as mock_now, captured_stdout() as cstdout:
38+ with mock.patch(
39+ 'revtracker.tasks.requests'
40+ ) as mock_requests, mock.patch(
41+ 'revtracker.tasks.now'
42+ ) as mock_now, captured_stdout() as cstdout:
43 mock_now.return_value = the_moment
44 mock_requests.head.return_value = mock_response
45 tasks.update_existing_deployments(project.pk)

Subscribers

People subscribed via source and target branches