From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-355179-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1QXxjS-0002yJ-DI
	for garchives@archives.gentoo.org; Sat, 18 Jun 2011 15:46:46 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 2C94F1C0C5;
	Sat, 18 Jun 2011 15:46:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id DAD491C0AA
	for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jun 2011 15:46:13 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 532C51B4030
	for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jun 2011 15:46:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 4A9A980040
	for <gentoo-commits@lists.gentoo.org>; Sat, 18 Jun 2011 15:46:12 +0000 (UTC)
From: "Petteri Räty" <betelgeuse@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" <betelgeuse@gentoo.org>
Message-ID: <9ccab32b9a8bd934555158115db64a25a266fb53.betelgeuse@gentoo>
Subject: [gentoo-commits] proj/council-webapp:master commit in: bot/tests/, bot/ircmeeting/
X-VCS-Repository: proj/council-webapp
X-VCS-Files: bot/ircmeeting/agenda.py bot/tests/run_test.py bot/tests/test_meeting.py
X-VCS-Directories: bot/tests/ bot/ircmeeting/
X-VCS-Committer: betelgeuse
X-VCS-Committer-Name: Petteri Räty
X-VCS-Revision: 9ccab32b9a8bd934555158115db64a25a266fb53
Date: Sat, 18 Jun 2011 15:46:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 57f8086a0a15da61cf764b7ef1af502f

commit:     9ccab32b9a8bd934555158115db64a25a266fb53
Author:     Joachim Filip Ignacy Bartosik <jbartosik <AT> gmail <DOT> com=
>
AuthorDate: Tue Jun 14 14:21:31 2011 +0000
Commit:     Petteri R=C3=A4ty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 16:45:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/council-webap=
p.git;a=3Dcommit;h=3D9ccab32b

Improve Supybot tests, fix bugs found in the process

---
 bot/ircmeeting/agenda.py  |   12 ++++----
 bot/tests/run_test.py     |   68 +++++++++++++++++++++++----------------=
-----
 bot/tests/test_meeting.py |   16 ++++++----
 3 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/bot/ircmeeting/agenda.py b/bot/ircmeeting/agenda.py
index 247907b..cfecc61 100644
--- a/bot/ircmeeting/agenda.py
+++ b/bot/ircmeeting/agenda.py
@@ -7,8 +7,8 @@ class Agenda(object):
     empty_agenda_msg =3D "Agenda is empty so I can't help you manage mee=
ting (and voting)."
     current_item_msg =3D "Current agenda item is {}."
     voting_already_open_msg =3D "Voting is already open. You can end it =
with #endvote."
-    voting_open_msg =3D "Voting started. Your choices are: {} Vote #vote=
 <option number>.\n End voting with #endvote."
-    voting_close_msg =3D "Voting is closed."
+    voting_open_msg =3D "Voting started. Your choices are:{}Vote #vote <=
option number>.\nEnd voting with #endvote."
+    voting_close_msg =3D "Voting closed."
     voting_already_closed_msg =3D "Voting is already closed. You can sta=
rt it with #startvote."
     voting_open_so_item_not_changed_msg =3D "Voting is currently open so=
 I didn't change item. Please #endvote first"
     can_not_vote_msg =3D "You can not vote. Only {} can vote"
@@ -38,7 +38,7 @@ class Agenda(object):
         if not self.conf.manage_agenda:
           return('')
         if self._vote_open:
-            return voting_open_so_item_not_changed_msg
+            return self.voting_open_so_item_not_changed_msg
         else:
             if (self._current_item + 1) < len(self._agenda):
                 self._current_item +=3D 1
@@ -48,7 +48,7 @@ class Agenda(object):
         if not self.conf.manage_agenda:
           return('')
         if self._vote_open:
-            return voting_open_so_item_not_changed_msg
+            return self.voting_open_so_item_not_changed_msg
         else:
             if self._current_item > 0:
                 self._current_item -=3D 1
@@ -70,8 +70,8 @@ class Agenda(object):
           return('')
         if self._vote_open:
             self._vote_open =3D False
-            return self.voting_already_closed_msg
-        return voting_close_msg
+            return self.voting_close_msg
+        return self.voting_already_closed_msg
=20
     def get_data(self):
         if not self.conf.manage_agenda:

diff --git a/bot/tests/run_test.py b/bot/tests/run_test.py
index f4e6e49..2b6c6f3 100644
--- a/bot/tests/run_test.py
+++ b/bot/tests/run_test.py
@@ -344,40 +344,44 @@ class MeetBotTest(unittest.TestCase):
         """
=20
         test =3D test_meeting.TestMeeting()
-        test.M.config.manage_agenda =3D True
         test.set_voters(['x', 'z'])
         test.set_agenda([['first item', ['opt1', 'opt2']], ['second item=
', []]])
-        test.process("""
-        20:13:50 <x> #startmeeting
-        20:13:50 <x> #nextitem
-        20:13:50 <x> #nextitem
-        20:13:50 <x> #previtem
-        20:13:50 <x> #previtem
-        20:13:50 <x> #startvote
-        20:13:50 <x> #vote 10
-        20:13:50 <x> #vote 1
-        20:13:50 <y> #vote 0
-        20:13:50 <z> #vote 0
-        20:13:50 <x> #endvote
-        20:13:50 <x> #endmeeting""")
-
-
-        answers =3D ['Current agenda item is second item.',
-            'Current agenda item is second item.',
-            'Current agenda item is first item.',
-            'Current agenda item is first item.',
-            'Voting started. Your choices are: ',
-            '0. first item',
-            "1. ['opt1', 'opt2']",
-            ' Vote #vote <option number>.',
-            ' End voting with #endvote.',
-            'Your vote was out of range!',
-            "You voted for #1 - ['opt1', 'opt2']",
-            'You can not vote. Only x, z can vote',
-            'You voted for #0 - first item']
-
-        self.assert_(test.votes =3D=3D {'first item': {u'x': 'opt2', u'z=
': 'opt1'}, 'second item': {}})
-        self.assert_(test.log[0:len(answers)] =3D=3D answers)
+
+
+        # Test starting meeting. Enable agenda management after that
+        test.answer_should_match("20:13:50 <x> #startmeeting",
+        "Meeting started .*\nUseful Commands: #action #agreed #help #inf=
o #idea #link #topic.\n")
+        test.M.config.manage_agenda =3D True
+
+        # Test moving through items
+        test.answer_should_match('20:13:50 <x> #nextitem', 'Current agen=
da item is second item.')
+        test.answer_should_match('20:13:50 <x> #nextitem', 'Current agen=
da item is second item.')
+        test.answer_should_match('20:13:50 <x> #previtem', 'Current agen=
da item is first item.')
+        test.answer_should_match('20:13:50 <x> #previtem', 'Current agen=
da item is first item.')
+
+        # Test voting
+        test.answer_should_match('20:13:50 <x> #startvote', 'Voting star=
ted\. ' +\
+                                  'Your choices are:\n0. opt1\n1. opt2\n=
Vote ' +\
+                                  '#vote <option number>.\nEnd voting wi=
th #endvote.')
+        test.answer_should_match('20:13:50 <x> #startvote', 'Voting is a=
lready open. ' +\
+                                  'You can end it with #endvote.')
+        test.answer_should_match('20:13:50 <x> #vote 10', 'Your vote was=
 out of range\!')
+        test.answer_should_match('20:13:50 <x> #vote 1', 'You voted for =
#1 - opt2')
+        test.answer_should_match('20:13:50 <x> #vote 0', 'You voted for =
#0 - opt1')
+        test.answer_should_match('20:13:50 <x> #vote 0', 'You voted for =
#0 - opt1')
+        test.answer_should_match('20:13:50 <x> #nextitem', 'Voting is cu=
rrently ' +\
+                                  'open so I didn\'t change item. Please=
 #endvote first')
+        test.answer_should_match('20:13:50 <x> #previtem', 'Voting is cu=
rrently ' +\
+                                  'open so I didn\'t change item. Please=
 #endvote first')
+        test.answer_should_match('20:13:50 <x> #endvote', 'Voting closed=
.')
+        test.answer_should_match('20:13:50 <x> #endvote', 'Voting is alr=
eady closed. ' +\
+                                  'You can start it with #startvote.')
+
+        test.M.config.manage_agenda =3D False
+        test.answer_should_match('20:13:50 <x> #endmeeting', 'Meeting en=
ded ' +\
+                                  '.*\nMinutes:.*\nMinutes \(text\):.*\n=
Log:.*')
+
+        assert(test.votes() =3D=3D {'first item': {u'x': 'opt2', u'z': '=
opt1'}, 'second item': {}})
=20
 if __name__ =3D=3D '__main__':
     os.chdir(os.path.join(os.path.dirname(__file__), '.'))

diff --git a/bot/tests/test_meeting.py b/bot/tests/test_meeting.py
index 9315b63..78bd2dc 100644
--- a/bot/tests/test_meeting.py
+++ b/bot/tests/test_meeting.py
@@ -2,13 +2,6 @@ import ircmeeting.meeting as meeting
 import ircmeeting.writers as writers
 import re
 import time
-def process_meeting(contents, extraConfig=3D{}, dontSave=3DTrue,
-                    filename=3D'/dev/null'):
-    """Take a test script, return Meeting object of that meeting.
-
-    To access the results (a dict keyed by extensions), use M.save(),
-    with M being the return of this function.
-    """
 class TestMeeting:
   logline_re =3D re.compile(r'\[?([0-9: ]*)\]? *<[@+]?([^>]+)> *(.*)')
   loglineAction_re =3D re.compile(r'\[?([0-9: ]*)\]? *\* *([^ ]+) *(.*)'=
)
@@ -57,5 +50,14 @@ class TestMeeting:
           line =3D m.group(3).strip()
           self.M.addline(nick, "ACTION "+line, time_=3Dtime_)
=20
+  def answer_should_match(self, line, answer_regexp):
+    self.log =3D []
+    self.process(line)
+    answer =3D '\n'.join(self.log)
+    error_msg =3D "Answer for:\n\t'" + line + "'\n was \n\t'" + answer +=
\
+                "'\ndid not match regexp\n\t'" + answer_regexp + "'"
+    answer_matches =3D re.match(answer_regexp, answer)
+    assert answer_matches, error_msg
+
   def votes(self):
     return(self.M.config.agenda._votes)