From 5cddf07361676c7a2ff0fdcdd2cfdaaca2696f1c Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 3 May 2019 13:30:54 -0700 Subject: [PATCH] test_mattermost_importer: Fix buggy use of wrong paths. This worked for me when testing locally because it was using a constant path, and so was accessing the product under `var/` of the previous test run. --- zerver/tests/test_mattermost_importer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zerver/tests/test_mattermost_importer.py b/zerver/tests/test_mattermost_importer.py index 0950a25d20..343eb6427f 100644 --- a/zerver/tests/test_mattermost_importer.py +++ b/zerver/tests/test_mattermost_importer.py @@ -199,11 +199,12 @@ class MatterMostImporter(ZulipTestCase): self.assertEqual(subscriber_handler.get_users(stream_id_mapper.get("slytherin-quidditch-team")), {3, 4}) def test_write_emoticon_data(self) -> None: + output_dir = self.make_import_output_dir("mattermost") zerver_realm_emoji = write_emoticon_data( realm_id=3, custom_emoji_data=self.mattermost_data["emoji"], data_dir=self.fixture_file_name("", "mattermost_fixtures"), - output_dir=self.make_import_output_dir("mattermost") + output_dir = output_dir ) self.assertEqual(len(zerver_realm_emoji), 2) self.assertEqual(zerver_realm_emoji[0]["file_name"], "peerdium") @@ -214,7 +215,7 @@ class MatterMostImporter(ZulipTestCase): self.assertEqual(zerver_realm_emoji[1]["realm"], 3) self.assertEqual(zerver_realm_emoji[1]["deactivated"], False) - records_file = os.path.join('var', 'test-mattermost-import', "emoji", "records.json") + records_file = os.path.join(output_dir, "emoji", "records.json") with open(records_file, "r") as f: records_json = ujson.load(f)