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

[Gavin Panella]

Change Copyright notices, fix small test issues.

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.

[lp:~allenap/tarmac/fix-votes-copyright]

352. By Gavin Panella on 2010-09-09

Merge trunk, resolving 1 conflict.

[Paul Hummer (rockstar)]

review: Approve

=== modified file 'tarmac/plugins/tests/test_votes.py'
--- tarmac/plugins/tests/test_votes.py	2010-09-07 20:52:17 +0000
+++ tarmac/plugins/tests/test_votes.py	2010-09-09 15:04:40 +0000
@@ -1,3 +1,18 @@
+# Copyright 2010 Canonical Ltd.
+# This file is part of Tarmac.
+#
+# Tarmac is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# Tarmac is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Tarmac.  If not, see <http://www.gnu.org/licenses/>.
+
 """Tests for the votes plugin."""
 
 import operator
@@ -76,8 +91,7 @@
                  "Got: 1 Abstain, 2 Approve, 1 Needs Information."),
                 str(error))
         else:
-            raise AssertionError(
-                "Votes.run() did not raise VotingViolation.")
+            self.fail("Votes.run() did not raise VotingViolation.")
 
     def test_run_global_config(self):
         target = Thing()
@@ -103,5 +117,4 @@
                  "Got: 1 Abstain, 2 Approve, 1 Needs Information."),
                 str(error))
         else:
-            raise AssertionError(
-                "Votes.run() did not raise VotingViolation.")
+            self.fail("Votes.run() did not raise VotingViolation.")

=== modified file 'tarmac/plugins/votes.py'
--- tarmac/plugins/votes.py	2010-09-07 20:52:17 +0000
+++ tarmac/plugins/votes.py	2010-09-09 15:04:40 +0000
@@ -1,10 +1,9 @@
-# Copyright 2009 Paul Hummer
+# Copyright 2010 Canonical Ltd.
 # This file is part of Tarmac.
 #
 # Tarmac is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
-# published by
-# the Free Software Foundation.
+# published by the Free Software Foundation.
 #
 # Tarmac is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of