Tarmac

Merge lp:~allenap/tarmac/fix-votes-copyright into lp:tarmac

  1. fix-votes-copyright
  2. Merge into main
Proposed by Gavin Panella
Status: Merged
Approved by: Paul Hummer
Approved revision: 352
Merged at revision: 352
Proposed branch: lp:~allenap/tarmac/fix-votes-copyright
Merge into: lp:tarmac
Diff against target: 56 lines (+19/-7)
2 files modified
tarmac/plugins/tests/test_votes.py (+17/-4)
tarmac/plugins/votes.py (+2/-3)
To merge this branch: bzr merge lp:~allenap/tarmac/fix-votes-copyright
Reviewer Review Type Date Requested Status
Paul Hummer Approve
Review via email: mp+34987@code.launchpad.net

Commit message

Change Copyright notices, fix small test issues.

Description of the change

Bjorn noticed that I hadn't set the copyright notice in the votes plugin (and its tests) correctly. I wrote it on work time so I've changed it to attribute copyright to Canonical. Is that okay?

I also smuggled a fix to one of the tests to use self.fail() instead of raising AssertionError, inspired from reading one of jml's recent blog posts.

To post a comment you must log in.
lp:~allenap/tarmac/fix-votes-copyright updated
352. By Gavin Panella

Merge trunk, resolving 1 conflict.

Revision history for this message
Paul Hummer (rockstar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tarmac/plugins/tests/test_votes.py'
2--- tarmac/plugins/tests/test_votes.py 2010-09-07 20:52:17 +0000
3+++ tarmac/plugins/tests/test_votes.py 2010-09-09 15:04:40 +0000
4@@ -1,3 +1,18 @@
5+# Copyright 2010 Canonical Ltd.
6+# This file is part of Tarmac.
7+#
8+# Tarmac is free software: you can redistribute it and/or modify
9+# it under the terms of the GNU General Public License version 3 as
10+# published by the Free Software Foundation.
11+#
12+# Tarmac is distributed in the hope that it will be useful,
13+# but WITHOUT ANY WARRANTY; without even the implied warranty of
14+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+# GNU General Public License for more details.
16+#
17+# You should have received a copy of the GNU General Public License
18+# along with Tarmac. If not, see <http://www.gnu.org/licenses/>.
19+
20 """Tests for the votes plugin."""
21
22 import operator
23@@ -76,8 +91,7 @@
24 "Got: 1 Abstain, 2 Approve, 1 Needs Information."),
25 str(error))
26 else:
27- raise AssertionError(
28- "Votes.run() did not raise VotingViolation.")
29+ self.fail("Votes.run() did not raise VotingViolation.")
30
31 def test_run_global_config(self):
32 target = Thing()
33@@ -103,5 +117,4 @@
34 "Got: 1 Abstain, 2 Approve, 1 Needs Information."),
35 str(error))
36 else:
37- raise AssertionError(
38- "Votes.run() did not raise VotingViolation.")
39+ self.fail("Votes.run() did not raise VotingViolation.")
40
41=== modified file 'tarmac/plugins/votes.py'
42--- tarmac/plugins/votes.py 2010-09-07 20:52:17 +0000
43+++ tarmac/plugins/votes.py 2010-09-09 15:04:40 +0000
44@@ -1,10 +1,9 @@
45-# Copyright 2009 Paul Hummer
46+# Copyright 2010 Canonical Ltd.
47 # This file is part of Tarmac.
48 #
49 # Tarmac is free software: you can redistribute it and/or modify
50 # it under the terms of the GNU General Public License version 3 as
51-# published by
52-# the Free Software Foundation.
53+# published by the Free Software Foundation.
54 #
55 # Tarmac is distributed in the hope that it will be useful,
56 # but WITHOUT ANY WARRANTY; without even the implied warranty of

Subscribers

People subscribed via source and target branches