]> granicus.if.org Git - graphviz/commitdiff
Remove rtest workaround for non stable cluster order
authorMagnus Jacobsson <magnus.jacobsson@berotec.se>
Tue, 11 Aug 2020 15:55:48 +0000 (17:55 +0200)
committerMagnus Jacobsson <magnus.jacobsson@berotec.se>
Wed, 12 Aug 2020 07:08:43 +0000 (09:08 +0200)
https://gitlab.com/graphviz/graphviz/-/issues/1789 and
https://gitlab.com/graphviz/graphviz/-/issues/1767

rtest/rtest.py

index 1e042dc3f29a91c7dc7d08112df4d9be68b73188..5a2af49473ea9f00d78e82c338bebf530d8c4001 100755 (executable)
@@ -113,17 +113,6 @@ def doDiff(OUTFILE, OUTDIR, REFDIR, testname, subtest_index, fmt):
   FILE1 = os.path.join(OUTDIR, OUTFILE)
   FILE2 = os.path.join(REFDIR, OUTFILE)
   F = fmt.split(':')[0]
-  # FIXME: Remove when https://gitlab.com/graphviz/graphviz/-/issues/1789 is
-  # fixed
-  if platform.system() == 'Windows' and \
-     F in ['ps', 'gv'] and \
-     testname in ['clusters', 'compound', 'rootlabel']:
-      print('Warning: Skipping {0} output comparison for test {1}:{2} : format '
-            '{3} because the order of clusters in gv or ps output is not '
-            'stable on Windows (#1789)'
-            .format(F, testname, subtest_index, fmt),
-            file=sys.stderr)
-      return
   if F in ['ps', 'ps2']:
     with open(TMPFILE1, mode='w') as fd1, \
          open(TMPFILE2, mode='w') as fd2: