[virtualcommons-svn] commit/vcweb: alllee: fixing tests, can't do straight string concatenatation with proxy objects

[<com...@bi...>]

1 new commit in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/6a6724dec000/
Changeset:   6a6724dec000
User:        alllee
Date:        2013-07-28 10:08:45
Summary:     fixing tests, can't do straight string concatenatation with proxy objects
Affected #:  2 files

diff -r 048136b560820b2b9e299a33ad92ef56caf1ff14 -r 6a6724dec000338606f54ccc0a2be3574c2adfde vcweb/core/models.py
--- a/vcweb/core/models.py
+++ b/vcweb/core/models.py
@@ -1126,12 +1126,12 @@
     ROUND_TYPES_DICT = dict(
             WELCOME=(_('Initial welcome page waiting room'), 'welcome.html'),
             GENERAL_INSTRUCTIONS=(_('General instructions and introduction to the experiment'), 'general-instructions.html'),
-            REGULAR=('Regular experiment round', 'participate.html'),
-            CHAT=('Chat round', 'chat.html'),
-            DEBRIEFING=('Debriefing round', 'debriefing.html'),
-            INSTRUCTIONS=('Instructions round', 'instructions.html'),
-            PRACTICE=('Practice round', 'practice.html'),
-            QUIZ=('Quiz round', 'quiz.html'))
+            REGULAR=(_('Regular experiment round'), 'participate.html'),
+            CHAT=(_('Chat round'), 'chat.html'),
+            DEBRIEFING=(_('Debriefing round'), 'debriefing.html'),
+            INSTRUCTIONS=(_('Instructions round'), 'instructions.html'),
+            PRACTICE=(_('Practice round'), 'practice.html'),
+            QUIZ=(_('Quiz round'), 'quiz.html'))
     ROUND_TYPES = (CHAT, DEBRIEFING, GENERAL_INSTRUCTIONS, INSTRUCTIONS, PRACTICE, QUIZ, REGULAR, WELCOME) = sorted(ROUND_TYPES_DICT.keys())
 
     RoundType = Choices(*[(round_type, ROUND_TYPES_DICT[round_type][0]) for round_type in ROUND_TYPES])

diff -r 048136b560820b2b9e299a33ad92ef56caf1ff14 -r 6a6724dec000338606f54ccc0a2be3574c2adfde vcweb/core/tests.py
--- a/vcweb/core/tests.py
+++ b/vcweb/core/tests.py
@@ -385,6 +385,6 @@
             logger.debug("inspecting round type: %s with data %s", round_type, data)
             rc = self.create_new_round_configuration(round_type=round_type)
             e.current_round_sequence_number = rc.sequence_number
-            self.assertEqual(e.current_round_template, "%s/%s" % (e.namespace, data[1]), 'should have returned template for ' + data[0])
+            self.assertEqual(e.current_round_template, "%s/%s" % (e.namespace, data[1]), 'should have returned template for %s' % data[0])

Repository URL: https://bitbucket.org/virtualcommons/vcweb/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.