some code review change

Jouramie · Mar 18, 2024 · 58ae787 · 58ae787
1 parent 68462a6
commit 58ae787
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/worlds/stardew_valley/stardew_rule/base.py b/worlds/stardew_valley/stardew_rule/base.py
@@ -435,13 +435,13 @@ def get_difficulty(self):
 
     def __str__(self):
         if self.item not in self.other_rules:
-            return f"Has {self.item} {self.group} -> {MISSING_ITEM}"
-        return f"Has {self.item} {self.group}"
+            return f"Has {self.item} ({self.group}) -> {MISSING_ITEM}"
+        return f"Has {self.item} ({self.group})"
 
     def __repr__(self):
         if self.item not in self.other_rules:
-            return f"Has {self.item} {self.group} -> {MISSING_ITEM}"
-        return f"Has {self.item} {self.group} -> {repr(self.other_rules[self.item])}"
+            return f"Has {self.item} ({self.group}) -> {MISSING_ITEM}"
+        return f"Has {self.item} ({self.group}) -> {repr(self.other_rules[self.item])}"
 
 
 class RepeatableChain(Iterable, Sized):

diff --git a/worlds/stardew_valley/test/stability/TestStability.py b/worlds/stardew_valley/test/stability/TestStability.py
@@ -6,6 +6,9 @@
 from BaseClasses import get_seed
 from .. import SVTestCase
 
+# There seems to be 4 bytes that appear at random at the end of the output, breaking the json... I don't know where they came from.
+BYTES_TO_REMOVE = 4
+
 # <function Location.<lambda> at 0x102ca98a0>
 lambda_regex = re.compile(r"^<function Location\.<lambda> at (.*)>$")
 # Python 3.10.2\r\n
@@ -26,8 +29,9 @@ def test_all_locations_and_items_are_the_same_between_two_generations(self):
         output_a = subprocess.check_output([sys.executable, '-m', 'worlds.stardew_valley.test.stability.StabilityOutputScript', '--seed', str(seed)])
         output_b = subprocess.check_output([sys.executable, '-m', 'worlds.stardew_valley.test.stability.StabilityOutputScript', '--seed', str(seed)])
 
-        result_a = json.loads(output_a[:-4])
-        result_b = json.loads(output_b[:-4])
+        #
+        result_a = json.loads(output_a[:-BYTES_TO_REMOVE])
+        result_b = json.loads(output_b[:-BYTES_TO_REMOVE])
 
         for i, ((room_a, bundles_a), (room_b, bundles_b)) in enumerate(zip(result_a["bundles"].items(), result_b["bundles"].items())):
             self.assertEqual(room_a, room_b, f"Bundle rooms at index {i} is different between both executions. Seed={seed}")