Merge remote-tracking branch 'origin/fix_1346'

CHANGELOG.md

@@ -14,6 +14,7 @@ at anytime.
 
 ### Fixed
   * check `claim_address` and `change_address` earlier on publishing, to avoid hard to understand errors later in the process
+  * mirroring being set on tests, making unrelated tests fail
   * loggly error reporting not following `share_usage_data`
   * improper error handling when data is not valid JSON
   * edge cases of http mirrored download of blobs

lbrynet/file_manager/EncryptedFileDownloader.py

@@ -57,7 +57,7 @@ class ManagedEncryptedFileDownloader(EncryptedFileSaver):
         self.channel_name = None
         self.metadata = None
         self.mirror = None
-        if download_mirrors:
+        if download_mirrors or conf.settings['download_mirrors']:
             self.mirror = HTTPBlobDownloader(
                 self.blob_manager, servers=download_mirrors or conf.settings['download_mirrors']
             )

lbrynet/tests/mocks.py

@@ -495,6 +495,7 @@ create_stream_sd_file = {
 
 
 def mock_conf_settings(obj, settings={}):
+    settings.setdefault('download_mirrors', [])
     conf.initialize_settings(False)
     original_settings = conf.settings
     conf.settings = conf.Config(conf.FIXED_SETTINGS, conf.ADJUSTABLE_SETTINGS)