From fa3c5d1909000d7007d2cd5d278e4c543b21b11a Mon Sep 17 00:00:00 2001 From: James Bensley Date: Mon, 1 Jan 2024 18:34:12 +0100 Subject: [PATCH] Fix references in tests from 'rcc' to 'rrc' --- .../rrc01.updates.20100827.0840.gz} | Bin .../rrc01.updates.20100827.0840.gz.json} | 0 .../rrc23.updates.20220421.0200.gz} | Bin .../rrc23.updates.20220421.0200.gz.json} | 0 ...rc23.updates.20220421.0200.mrt_entry.json} | 0 .../rrc23.updates.20220501.2305.gz} | Bin .../rrc23.updates.20220501.2305.gz.json} | 0 dnas/tests/test_mrt_archives.py | 32 ++++++++++++------ dnas/tests/test_mrt_entry.py | 10 +++--- dnas/tests/test_mrt_stats.py | 24 ++++++------- 10 files changed, 38 insertions(+), 28 deletions(-) rename dnas/tests/{RCC1/rcc01.updates.20100827.0840.gz => RRC1/rrc01.updates.20100827.0840.gz} (100%) rename dnas/tests/{RCC1/rcc01.updates.20100827.0840.gz.json => RRC1/rrc01.updates.20100827.0840.gz.json} (100%) rename dnas/tests/{RCC23/rcc23.updates.20220421.0200.gz => RRC23/rrc23.updates.20220421.0200.gz} (100%) rename dnas/tests/{RCC23/rcc23.updates.20220421.0200.gz.json => RRC23/rrc23.updates.20220421.0200.gz.json} (100%) rename dnas/tests/{RCC23/rcc23.updates.20220421.0200.mrt_entry.json => RRC23/rrc23.updates.20220421.0200.mrt_entry.json} (100%) rename dnas/tests/{RCC23/rcc23.updates.20220501.2305.gz => RRC23/rrc23.updates.20220501.2305.gz} (100%) rename dnas/tests/{RCC23/rcc23.updates.20220501.2305.gz.json => RRC23/rrc23.updates.20220501.2305.gz.json} (100%) diff --git a/dnas/tests/RCC1/rcc01.updates.20100827.0840.gz b/dnas/tests/RRC1/rrc01.updates.20100827.0840.gz similarity index 100% rename from dnas/tests/RCC1/rcc01.updates.20100827.0840.gz rename to dnas/tests/RRC1/rrc01.updates.20100827.0840.gz diff --git a/dnas/tests/RCC1/rcc01.updates.20100827.0840.gz.json b/dnas/tests/RRC1/rrc01.updates.20100827.0840.gz.json similarity index 100% rename from dnas/tests/RCC1/rcc01.updates.20100827.0840.gz.json rename to dnas/tests/RRC1/rrc01.updates.20100827.0840.gz.json diff --git a/dnas/tests/RCC23/rcc23.updates.20220421.0200.gz b/dnas/tests/RRC23/rrc23.updates.20220421.0200.gz similarity index 100% rename from dnas/tests/RCC23/rcc23.updates.20220421.0200.gz rename to dnas/tests/RRC23/rrc23.updates.20220421.0200.gz diff --git a/dnas/tests/RCC23/rcc23.updates.20220421.0200.gz.json b/dnas/tests/RRC23/rrc23.updates.20220421.0200.gz.json similarity index 100% rename from dnas/tests/RCC23/rcc23.updates.20220421.0200.gz.json rename to dnas/tests/RRC23/rrc23.updates.20220421.0200.gz.json diff --git a/dnas/tests/RCC23/rcc23.updates.20220421.0200.mrt_entry.json b/dnas/tests/RRC23/rrc23.updates.20220421.0200.mrt_entry.json similarity index 100% rename from dnas/tests/RCC23/rcc23.updates.20220421.0200.mrt_entry.json rename to dnas/tests/RRC23/rrc23.updates.20220421.0200.mrt_entry.json diff --git a/dnas/tests/RCC23/rcc23.updates.20220501.2305.gz b/dnas/tests/RRC23/rrc23.updates.20220501.2305.gz similarity index 100% rename from dnas/tests/RCC23/rcc23.updates.20220501.2305.gz rename to dnas/tests/RRC23/rrc23.updates.20220501.2305.gz diff --git a/dnas/tests/RCC23/rcc23.updates.20220501.2305.gz.json b/dnas/tests/RRC23/rrc23.updates.20220501.2305.gz.json similarity index 100% rename from dnas/tests/RCC23/rcc23.updates.20220501.2305.gz.json rename to dnas/tests/RRC23/rrc23.updates.20220501.2305.gz.json diff --git a/dnas/tests/test_mrt_archives.py b/dnas/tests/test_mrt_archives.py index cac3a7f..cb1a908 100644 --- a/dnas/tests/test_mrt_archives.py +++ b/dnas/tests/test_mrt_archives.py @@ -66,17 +66,27 @@ def test_get_arch_option(self: "test_mrt_archives") -> None: ValueError, self.mrt_a.get_arch_option, "/tmp/9jw2f8wi", "abc" ) - arch = self.mrt_a.archives[0] - filename = arch.gen_latest_upd_fn() - filepath = os.path.normpath(arch.MRT_DIR + "/" + filename) - - ret = self.mrt_a.get_arch_option(filepath, "ENABLED") - self.assertIsInstance(ret, bool) - self.assertEqual(ret, True) - - self.assertRaises( - AttributeError, self.mrt_a.get_arch_option, filepath, "hwiwewohh7" - ) + for arch in self.mrt_a.archives: + # Find an enabled archive to test with: + if arch.ENABLED: + filename = arch.gen_latest_upd_fn() + filepath = os.path.normpath(arch.MRT_DIR + "/" + filename) + + # Try to get a valid archive option + ret = self.mrt_a.get_arch_option(filepath, "ENABLED") + self.assertIsInstance(ret, bool) + self.assertEqual(ret, True) + + # Try to get an invalid one + self.assertRaises( + AttributeError, + self.mrt_a.get_arch_option, + filepath, + "hwiwewohh7", + ) + break + else: + raise AssertionError(f"Couldn't find enabled MRT archive") def test_get_day_key(self: "test_mrt_archives") -> None: self.assertRaises(ValueError, self.mrt_a.get_day_key, "") diff --git a/dnas/tests/test_mrt_entry.py b/dnas/tests/test_mrt_entry.py index 6a8d44f..9535772 100644 --- a/dnas/tests/test_mrt_entry.py +++ b/dnas/tests/test_mrt_entry.py @@ -22,19 +22,19 @@ def setUp(self: "test_mrt_entry") -> None: Copy the test files to the location they would be in, if we had downloaded them from the public archives: """ - self.upd_1_fn = "rcc23.updates.20220421.0200.gz" + self.upd_1_fn = "rrc23.updates.20220421.0200.gz" self.upd_1_path = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "RCC23/", + "RRC23/", self.upd_1_fn, ) if not os.path.isfile(self.upd_1_path): raise Exception(f"Test MRT file is not found: {self.upd_1_path}") - self.entry_1_fn = "rcc23.updates.20220421.0200.mrt_entry.json" + self.entry_1_fn = "rrc23.updates.20220421.0200.mrt_entry.json" self.entry_1_path = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "RCC23/", + "RRC23/", self.entry_1_fn, ) if not os.path.isfile(self.entry_1_path): @@ -44,7 +44,7 @@ def setUp(self: "test_mrt_entry") -> None: mrt_a = mrt_archives() for arch in mrt_a.archives: - if arch.NAME == "UNIT_TEST_RCC_23": + if arch.NAME == "UNIT_TEST_RRC_23": os.makedirs(arch.MRT_DIR, exist_ok=True) self.upd_1_mrt = os.path.join(arch.MRT_DIR, self.upd_1_fn) diff --git a/dnas/tests/test_mrt_stats.py b/dnas/tests/test_mrt_stats.py index 5d1c540..e2e5791 100644 --- a/dnas/tests/test_mrt_stats.py +++ b/dnas/tests/test_mrt_stats.py @@ -21,15 +21,15 @@ def setUp(self: "test_mrt_stats") -> None: Copy the test files to the location they would be in, if we had downloaded them from the public archives: """ - self.upd_1_fn = "rcc23.updates.20220421.0200.gz" - self.upd_2_fn = "rcc23.updates.20220501.2305.gz" + self.upd_1_fn = "rrc23.updates.20220421.0200.gz" + self.upd_2_fn = "rrc23.updates.20220501.2305.gz" self.upd_3_fn = "sydney.updates.20220601.0230.bz2" self.upd_4_fn = "sydney.updates.20220601.0415.bz2" - self.upd_5_fn = "rcc01.updates.20100827.0840.gz" + self.upd_5_fn = "rrc01.updates.20100827.0840.gz" self.upd_1_path = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "RCC23/", + "RRC23/", self.upd_1_fn, ) if not os.path.isfile(self.upd_1_path): @@ -37,7 +37,7 @@ def setUp(self: "test_mrt_stats") -> None: self.upd_2_path = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "RCC23/", + "RRC23/", self.upd_2_fn, ) if not os.path.isfile(self.upd_2_path): @@ -60,17 +60,17 @@ def setUp(self: "test_mrt_stats") -> None: raise Exception(f"Test MRT file is not found: {self.upd_4_path}") self.upd_5_path = os.path.join( - os.path.dirname(os.path.realpath(__file__)), "RCC1/", self.upd_5_fn + os.path.dirname(os.path.realpath(__file__)), "RRC1/", self.upd_5_fn ) if not os.path.isfile(self.upd_5_path): raise Exception(f"Test MRT file is not found: {self.upd_5_path}") mrt_a = mrt_archives() for arch in mrt_a.archives: - if arch.NAME == "UNIT_TEST_RCC_1": + if arch.NAME == "UNIT_TEST_RRC_1": os.makedirs(arch.MRT_DIR, exist_ok=True) self.upd_5_mrt = os.path.join(arch.MRT_DIR, self.upd_5_fn) - if arch.NAME == "UNIT_TEST_RCC_23": + if arch.NAME == "UNIT_TEST_RRC_23": os.makedirs(arch.MRT_DIR, exist_ok=True) self.upd_1_mrt = os.path.join(arch.MRT_DIR, self.upd_1_fn) self.upd_2_mrt = os.path.join(arch.MRT_DIR, self.upd_2_fn) @@ -100,7 +100,7 @@ def setUp(self: "test_mrt_stats") -> None: self.upd_1_json = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "RCC23/", + "RRC23/", self.upd_1_fn + ".json", ) if not os.path.isfile(self.upd_1_json): @@ -120,7 +120,7 @@ def setUp(self: "test_mrt_stats") -> None: self.upd_5_json = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "RCC1/", + "RRC1/", self.upd_5_fn + ".json", ) if not os.path.isfile(self.upd_3_json): @@ -130,8 +130,8 @@ def setUp(self: "test_mrt_stats") -> None: self.upd_1_test = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "RCC23/", - "rcc23.updates.20220421.0200.gz.test", + "RRC23/", + "rrc23.updates.20220421.0200.gz.test", ) def test_init(self: "test_mrt_stats") -> None: