[BB-2174] Retry flaky validate_translations in Travis CI (#71)

.travis.yml

@@ -21,7 +21,7 @@ script:
   - make selfcheck
   - make quality
   - make test
-  - make validate_translations
+  - travis_retry make validate_translations
 
 notifications:
   email: false

Makefile

@@ -84,9 +84,9 @@ extract_translations: ## extract strings to be translated, outputting .po files
 	@# django-admin makemessages -l en -v1 -d djangojs -e js
 
 	# Extract Handlebars i18n strings
-	echo > locale/en/LC_MESSAGES/textjs.po  # Ensure it's empty
+	> locale/en/LC_MESSAGES/textjs.po  # Ensure it's empty
 	# The sort to avoid bash arbitrary file order
-	ls poll/public/handlebars/*.handlebars | sort \
+	ls poll/public/handlebars/*.handlebars \
 	    | xargs node node_modules/.bin/xgettext-template --from-code utf8 \
 	        --language Handlebars \
 	        --force-po \

package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "xgettext-template": "^3.4.2"
+    "xgettext-template": "^4.0.2"
   }
 }

poll/translations/en/LC_MESSAGES/text.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-07 09:53+0000\n"
+"POT-Creation-Date: 2020-03-17 14:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -90,7 +90,7 @@ msgstr ""
 msgid "Private results may not be False when Maximum Submissions is not 1."
 msgstr ""
 
-#: poll/poll.py:449 poll/poll.py:841
+#: poll/poll.py:449 poll/poll.py:842
 msgid "Poll"
 msgstr ""
 
@@ -118,15 +118,15 @@ msgstr ""
 msgid "The answer options on this poll."
 msgstr ""
 
-#: poll/poll.py:464 poll/poll.py:867
+#: poll/poll.py:464 poll/poll.py:868
 msgid "Total tally of answers from students."
 msgstr ""
 
 #: poll/poll.py:465
 msgid "The student's answer"
 msgstr ""
 
-#: poll/poll.py:673 poll/poll.py:1147
+#: poll/poll.py:673 poll/poll.py:1148
 msgid "You have already voted in this poll."
 msgstr ""
 
@@ -140,75 +140,75 @@ msgstr ""
 msgid "No key \"{choice}\" in answers table."
 msgstr ""
 
-#: poll/poll.py:696 poll/poll.py:1155
+#: poll/poll.py:696 poll/poll.py:1156
 msgid "You have already voted as many times as you are allowed."
 msgstr ""
 
 #: poll/poll.py:726
 msgid "You must specify a question."
 msgstr ""
 
-#: poll/poll.py:729 poll/poll.py:826 poll/poll.py:1209 poll/poll.py:1336
+#: poll/poll.py:729 poll/poll.py:826 poll/poll.py:1210 poll/poll.py:1338
 msgid "Answer"
 msgstr ""
 
-#: poll/poll.py:825 poll/poll.py:1210 poll/poll.py:1335
+#: poll/poll.py:825 poll/poll.py:1211 poll/poll.py:1337
 msgid "Question"
 msgstr ""
 
-#: poll/poll.py:827 poll/poll.py:1337
+#: poll/poll.py:828 poll/poll.py:1339
 msgid "Submissions count"
 msgstr ""
 
-#: poll/poll.py:838
+#: poll/poll.py:839
 msgid "Survey"
 msgstr ""
 
-#: poll/poll.py:844
+#: poll/poll.py:845
 msgid "Yes"
 msgstr ""
 
-#: poll/poll.py:845
+#: poll/poll.py:846
 msgid "No"
 msgstr ""
 
-#: poll/poll.py:846
+#: poll/poll.py:847
 msgid "Maybe"
 msgstr ""
 
-#: poll/poll.py:848
+#: poll/poll.py:849
 msgid "Answer choices for this Survey"
 msgstr ""
 
-#: poll/poll.py:852
+#: poll/poll.py:853
 msgid "Are you enjoying the course?"
 msgstr ""
 
-#: poll/poll.py:854
+#: poll/poll.py:855
 msgid "Would you recommend this course to your friends?"
 msgstr ""
 
-#: poll/poll.py:858
+#: poll/poll.py:859
 msgid "Do you think you will learn a lot?"
 msgstr ""
 
-#: poll/poll.py:860
+#: poll/poll.py:861
 msgid "Questions for this Survey"
 msgstr ""
 
-#: poll/poll.py:869
+#: poll/poll.py:870
 msgid "The user's answers"
 msgstr ""
 
-#: poll/poll.py:1163
+#: poll/poll.py:1164
 msgid ""
 "Not all questions were included, or unknown questions were included. Try "
 "refreshing and trying again."
 msgstr ""
 
 #. Translators: {answer_key} uniquely identifies a specific answer belonging to a poll or survey.
 #. {question_key} uniquely identifies a specific question belonging to a poll or survey.
-#: poll/poll.py:1176
+#: poll/poll.py:1177
 #, python-brace-format
 msgid "Found unknown answer '{answer_key}' for question key '{question_key}'"
 msgstr ""

poll/translations/eo/LC_MESSAGES/text.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-07 09:53+0000\n"
+"POT-Creation-Date: 2020-03-17 14:23+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"

requirements-dev.txt

@@ -3,7 +3,7 @@
 Django==1.11.25
 django-statici18n==1.8.2
 transifex-client==0.12.1
-edx-i18n-tools==0.4.5
+edx-i18n-tools==0.5.0
 pycodestyle==2.4.0
 pylint
 tox==3.14.0

tests/integration/test_max_submissions.py

@@ -53,7 +53,7 @@ def test_infinite_submissions(self, page, names):
             self.go_to_page(page)
             for ___ in range(1, 5):
                 self.do_submit(names)
-            self.assertTrue(self.get_submit().is_enabled())
+            self.wait_until_exists('input[name=poll-submit]:enabled')
 
     @unpack
     @data(*scenarios_max)