Merge pull request #124 from fchapoton/exp_test1

working on experimental tests

Author: fchapoton

tests/experimental/test_buildexamples.py

@@ -1,8 +1,13 @@
 """
 Script to build the the dot2tex examples.
 """
-
-import re, os, shutil, glob, sys, logging
+import glob
+import logging
+import os
+import re
+import shutil
+import subprocess
+import sys
 
 from os.path import join, basename, splitext, normpath, abspath
 
@@ -30,7 +35,8 @@ def copyifnewer(source, dest):
         source_ts = os.path.getmtime(source)
         dest_ts = os.path.getmtime(dest)
         # compare timestamps
-        if source_ts > dest_ts: copy = True
+        if source_ts > dest_ts:
+            copy = True
     else:
         copy = True
         dir = os.path.dirname(dest)
@@ -42,36 +48,40 @@ def copyifnewer(source, dest):
 
 
 def runcmd(syscmd):
-    #err = os.system(syscmd)
-    sres = os.popen(syscmd)
-    resdata = sres.read()
-    err = sres.close()
+    """
+    Run a system command.
+    """
+    result = subprocess.run(syscmd, text=True, capture_output=True)
+    err = result.returncode
     if err:
         log.warning('Failed to run command:\n%s', syscmd)
-        log.debug('Output:\n%s', resdata)
+        log.debug('Output:\n%s', result)
     return err
 
 
 def meps(filename):
     fn = splitext(filename)[0]
     s = "latex -halt-on-error -interaction nonstopmode %s.tex" % fn
     err = runcmd(s)
-    if err: return err
+    if err:
+        return err
     if sys.platform == 'win32':
         s = "dvips -Ppdf -G0 -D600 -E* -o%s.eps %s.dvi" % (fn, fn)
         err = runcmd(s)
-        if err: return err
+        if err:
+            return err
         s = "epstool --bbox --copy --output %s_tmp.eps %s.eps" % (fn, fn)
         err = runcmd(s)
-        if err: return err
+        if err:
+            return err
         try:
             os.remove("%s.eps" % fn)
             os.remove("%s.dvi" % fn)
             os.remove("%s.aux" % fn)
             os.remove("%s.log" % fn)
-        #os.remove("%s.pgf" % fn)
+        # os.remove("%s.pgf" % fn)
 
-        except:
+        except OSError:
             raise
         os.rename("%s_tmp.eps" % fn, "%s.eps" % fn)
         s = "epstopdf %s.eps" % fn
@@ -81,7 +91,8 @@ def meps(filename):
         err = runcmd(s)
         s = "ps2eps -B -f %s.ps" % fn
         err = runcmd(s)
-        if err: return err
+        if err:
+            return err
         s = "epstopdf %s.eps" % fn
         err = runcmd(s)
 
@@ -117,24 +128,22 @@ def make_img(c, filenm, name):
         return err
 
     if (c.find('--crop') > -1):
-        #os.system('del %s.png %s.jpg' % (name,name))
+        # os.system('del %s.png %s.jpg' % (name,name))
         err = create_pdf(filename)
-        #print("using mppdf")
+        # print("using mppdf")
     else:
         err = meps(filename)
 
     return err
 
 
 def build_gallery(filelist):
-    #os.chdir(EXAMPLES_DIR)
-    entrylist = []
+    # os.chdir(EXAMPLES_DIR)
     failedfiles = []
     for file in filelist:
         f = open(file, 'r')
         data = f.read()
         f.close()
-        entry = {}
         dirname, filename = os.path.split(file)
         os.chdir(dirname)
         name = os.path.splitext(filename)[0]
@@ -167,13 +176,10 @@ def build_gallery(filelist):
 
     failedfiles = build_gallery(filelist)
     if failedfiles:
-        log.warning('Failed files: %s', failedfiles);
+        log.warning('Failed files: %s', failedfiles)
         sys.exit(1)
     else:
         print("All tests passed!")
         sys.exit(0)
 
-        #filelist=['distances.dot','tikzshapes.dot']
-
-
-
+        # filelist=['distances.dot','tikzshapes.dot']

tests/experimental/test_comparedotparsing.py

@@ -3,7 +3,7 @@
 The basic test is to compare PNG renderings of the original graph and the
 parsed and saved version.
 """
-
+from pathlib import Path
 import unittest
 
 # import dot2tex.dotparsing as dotp
@@ -27,12 +27,12 @@
 
 
 # Directory with test files
-BASE_DIR = join(os.path.dirname(__file__), "testgraphs/")
+BASE_DIR = Path(__file__).parent.parent / "testgraphs/"
 TESTFILES_DIR = "parsetests"
-TESTFILES_PATH = join(BASE_DIR, TESTFILES_DIR)
+TESTFILES_PATH = BASE_DIR / TESTFILES_DIR
 
-PNG_DIR = join(TESTFILES_PATH, 'pngs')
-DOT_DIR = join(TESTFILES_PATH, 'dpdots')
+PNG_DIR = TESTFILES_PATH / 'pngs'
+DOT_DIR = TESTFILES_PATH / 'dpdots'
 
 graphparser = dotparsing.DotDataParser()
 
@@ -127,14 +127,16 @@ def test_subgraphs(self):
     def test_quoting(self):
         self.assertEqual(test_dotfile("quoting.dot"), 1)
 
-    def test_unicode1(self):
-        self.assertEqual(test_dotfile("unicode1.dot"), 1)
+    # the following three files are missing, so desactivate
+
+    # def test_unicode1(self):
+    #     self.assertEqual(test_dotfile("unicode1.dot"), 1)
 
-    def test_current(self):
-        self.assertEqual(test_dotfile("current.dot"), 1)
+    # def test_current(self):
+    #     self.assertEqual(test_dotfile("current.dot"), 1)
 
-    def test_ports(self):
-        self.assertEqual(test_dotfile("ports.dot"), 1)
+    # def test_ports(self):
+    #     self.assertEqual(test_dotfile("ports.dot"), 1)
 
 
 if __name__ == "__main__":

tests/experimental/test_multirender.py

@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 import sys
 
 from os.path import join, basename, splitext, normpath, abspath
@@ -25,10 +26,10 @@
 # log.setLevel(logging.INFO)
 
 # Directory with test files
-BASE_DIR = join(abspath(os.path.dirname(__file__)), "")
+BASE_DIR = Path(__file__).absolute().parent.parent
 TESTFILES_DIR = "testgraphs/"
-TESTFILES_PATH = join(BASE_DIR, TESTFILES_DIR)
-DEST_DIR = join(BASE_DIR, 'tmp/')
+TESTFILES_PATH = BASE_DIR / TESTFILES_DIR
+DEST_DIR = BASE_DIR / 'tmp/'
 
 
 def runcmd(syscmd):