diff --git a/zerver/data_import/slack.py b/zerver/data_import/slack.py index 0c30e3ff0d..749c47b3ad 100755 --- a/zerver/data_import/slack.py +++ b/zerver/data_import/slack.py @@ -379,7 +379,7 @@ def channels_to_zerver_stream(slack_data_dir: str, realm_id: int, realm["zerver_stream"].append(stream) slack_default_channels = ['general', 'random'] - if channel['name'] in slack_default_channels: + if channel['name'] in slack_default_channels and not stream['deactivated']: defaultstream = build_defaultstream(realm_id, stream_id, defaultstream_id) realm["zerver_defaultstream"].append(defaultstream) diff --git a/zerver/tests/test_slack_importer.py b/zerver/tests/test_slack_importer.py index 7a4c0e35de..ba8b2dc48c 100644 --- a/zerver/tests/test_slack_importer.py +++ b/zerver/tests/test_slack_importer.py @@ -424,9 +424,11 @@ class SlackImporter(ZulipTestCase): | set(test_added_mpims.keys()) self.assertDictEqual(test_added_channels, added_channels) - # zerver defaultstream already tested in helper functions + # zerver defaultstream already tested in helper functions. + # Note that the `random` stream is archived and thus should + # not be created as a DefaultStream. self.assertEqual(realm["zerver_defaultstream"], - [{'id': 0, 'realm': 3, 'stream': 0}, {'id': 1, 'realm': 3, 'stream': 1}]) + [{'id': 0, 'realm': 3, 'stream': 1}]) self.assertDictEqual(test_added_mpims, added_mpims) self.assertDictEqual(test_dm_members, dm_members)