Merge pull request #17 from sfider/tests-on-windows

Fix tests for windows, which appears to have a lower resolution time
pub-solar · Dec 4, 2024 · 9e56857 · 9e56857
2 parents f93c207 + d22cd80
commit 9e56857
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 76 deletions.
diff --git a/tests/resources/frames-with-conflict b/tests/resources/frames-with-conflict
@@ -1,26 +1,26 @@
 [
  [
-  4000, 
-  4015, 
+  40000, 
+  40150, 
   "foo", 
   "1", 
   [], 
-  4015
+  40150
  ], 
  [
-  4020, 
-  4050, 
+  40200, 
+  40500, 
   "bar", 
   "2", 
   [], 
-  4050
+  40500
  ], 
  [
-  4050, 
-  4100, 
+  40500, 
+  41000, 
   "bar", 
   "3", 
   [], 
-  4100
+  41000
  ]
 ]
-Original file line number
+Diff line change
@@ -1,26 +1,26 @@
     [
      [
-,
-,
+,
+,
       "foo",
       "1",
       [],
      ],
      [
-,
-,
+,
+,
       "bar",
       "2",
       [],
      ],
      [
-,
-,
+,
+,
       "bar",
       "3",
       [],
      ]
     ]