Merge pull request #5585 from learningequality/0.17.x

0.17.x into master
learningequality · Jul 12, 2018 · 4e34856 · 4e34856
2 parents 7f0ddb7 + c1821e2
commit 4e34856
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/docs/installguide/release_notes.rst b/docs/installguide/release_notes.rst
@@ -18,6 +18,11 @@ Bug fixes
 * Slow download using ``retrievecontentpack`` on Raspberry Pi :url-issue:`5575`
 * Customized content packs may fail depending on the Zip program used :url-issue:`5476`
 
+Removed
+^^^^^^^
+
+* Removed ``--foreground`` flag from ``retrievecontentpack`` command, the default behaviour is foreground :url-issue:`5575`
+
 
 0.17.4
 ------

diff --git a/kalite/updates/tests/download_tests.py b/kalite/updates/tests/download_tests.py
@@ -139,8 +139,8 @@ def test_download_command(self):
     @mock.patch("kalite.updates.videos.get_thumbnail_url")
     @mock.patch("kalite.updates.videos.get_video_url")
     def test_500_download(self, get_thumbnail_url, get_video_url):
-        get_thumbnail_url.return_value = "https://httpstat.us/500"
-        get_video_url.return_value = "https://httpstat.us/500"
+        get_thumbnail_url.return_value = "http://httpstat.us/500"
+        get_video_url.return_value = "http://httpstat.us/500"
 
         with self.assertRaises(HTTPError):
             download_video(self.real_video.youtube_id)
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,11 @@ Bug fixes @@
     * Slow download using ``retrievecontentpack`` on Raspberry Pi :url-issue:`5575`
     * Customized content packs may fail depending on the Zip program used :url-issue:`5476`
+    Removed
+    ^^^^^^^
+    * Removed ``--foreground`` flag from ``retrievecontentpack`` command, the default behaviour is foreground :url-issue:`5575`
 .17.4
     ------
@@ Expand Down @@