Adjust tests to reverted changes

Author: prmtl

test/test_pydot.py

@@ -123,96 +123,12 @@ def test_unicode_ids(self):
         self.assertEqual(g2.get_edges()[0].get_source(), node1)
         self.assertEqual(g2.get_edges()[0].get_destination(), node2)
 
-    @unittest.skip("failing checksum")
-    def test_graph_with_shapefiles(self):
-        shapefile_dir = os.path.join(TEST_DIR, 'from-past-to-future')
-        dot_file = os.path.join(shapefile_dir, 'from-past-to-future.dot')
-
-        pngs = [
-            os.path.join(shapefile_dir, fname)
-            for fname in os.listdir(shapefile_dir)
-            if fname.endswith('.png')]
-
-        f = open(dot_file, 'rt')
-        graph_data = f.read()
-        f.close()
-
-        g = pydot.graph_from_dot_data(graph_data)
-        g.set_shape_files(pngs)
-        jpe_data = g.create(format='jpe')
-        hexdigest = sha256(jpe_data).hexdigest()
-        hexdigest_original = self._render_with_graphviz(dot_file)
-        self.assertEqual(hexdigest, hexdigest_original)
-
     def test_multiple_graphs(self):
         graph_data = 'graph A { a->b };\ngraph B {c->d}'
         graphs = pydot.graph_from_dot_data(graph_data)
         self.assertEqual(len(graphs), 2)
         self.assertEqual([g.get_name() for g in graphs], ['A', 'B'])
 
-    def _render_with_graphviz(self, filename):
-        p = subprocess.Popen(
-            (DOT_BINARY_PATH, '-Tjpe'),
-            cwd=os.path.dirname(filename),
-            stdin=open(filename, 'rt'),
-            stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-
-        stdout = p.stdout
-
-        stdout_output = list()
-        while True:
-            data = stdout.read()
-            if not data:
-                break
-            stdout_output.append(data)
-        stdout.close()
-
-        if stdout_output:
-            stdout_output = NULL_SEP.join(stdout_output)
-
-        # this returns a status code we should check
-        p.wait()
-
-        return sha256(stdout_output).hexdigest()
-
-    def _render_with_pydot(self, filename):
-        g = pydot.graph_from_dot_file(filename)
-        if not isinstance(g, list):
-            g = [g]
-        jpe_data = NULL_SEP.join([_g.create(format='jpe') for _g in g])
-        return sha256(jpe_data).hexdigest()
-
-    def test_my_regression_tests(self):
-        self._render_and_compare_dot_files(MY_REGRESSION_TESTS_DIR)
-
-    @unittest.skip('failing checksum')
-    def test_graphviz_regression_tests(self):
-        self._render_and_compare_dot_files(REGRESSION_TESTS_DIR)
-
-    def _render_and_compare_dot_files(self, directory):
-
-        dot_files = [
-            fname for fname in os.listdir(directory)
-            if fname.endswith('.dot')]
-
-        for dot in dot_files:
-            os.sys.stdout.write('#')
-            os.sys.stdout.flush()
-
-            fname = os.path.join(directory, dot)
-
-            try:
-                parsed_data_hexdigest = self._render_with_pydot(fname)
-                original_data_hexdigest = self._render_with_graphviz(fname)
-            except Exception:
-                print('Failed rendering BAD(%s)' % dot)
-                raise
-
-            if parsed_data_hexdigest != original_data_hexdigest:
-                print('BAD(%s)' % dot)
-
-            self.assertEqual(parsed_data_hexdigest, original_data_hexdigest)
-
     def test_numeric_node_id(self):
         self._reset_graphs()
         self.graph_directed.add_node(pydot.Node(1))
@@ -288,22 +204,24 @@ def test_quoting(self):
 
 class TestQuoting(unittest.TestCase):
 
+    # TODO(prmtl): this need to be checked with DOT lang
+    # sepcification (or how graphviz works) again
     def test_quote_cases(self):
         checks = (
             ('A:', '"A:"'),
             (':B', '":B"'),
-            ('A:B', '"A:B"'),
+            ('A:B', 'A:B'),
             ('1A', '"1A"'),
             ('A', 'A'),
             ('11', '11'),
             ('_xyz', '_xyz'),
-            ('.11', '.11'),
-            ('-.09', '-.09'),
-            ('1.8', '1.8'),
-            ('', '""'),
+            ('.11', '".11"'),
+            ('-.09', '"-.09"'),
+            ('1.8', '"1.8"'),
+            # ('', '""'),
             ('"1abc"', '"1abc"'),
             ('@', '"@"'),
-            ('ÿ', 'ÿ'),
+            ('ÿ', '"ÿ"'),
             ('$GUID__/ffb73e1c-7495-40b3-9618-9e5462fc89c7',
              '"$GUID__/ffb73e1c-7495-40b3-9618-9e5462fc89c7"')
         )

test/test_rendering_dot_files.py

@@ -37,6 +37,9 @@ def list_dots(path):
 
 
 def pytest_generate_tests(metafunc):
+    if metafunc.function != test_render_and_compare_dot_files:
+        return
+
     idlist = []
     argvalues = []
     for name, dir in TESTS_DIRS:
@@ -52,39 +55,63 @@ def pytest_generate_tests(metafunc):
     )
 
 
+def _render_with_graphviz(filename):
+    p = subprocess.Popen(
+        (DOT_BINARY_PATH, '-Tjpe'),
+        cwd=os.path.dirname(filename),
+        stdin=open(filename, 'rt'),
+        stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+
+    stdout = p.stdout
+
+    stdout_output = list()
+    while True:
+        data = stdout.read()
+        if not data:
+            break
+        stdout_output.append(data)
+    stdout.close()
+
+    if stdout_output:
+        stdout_output = NULL_SEP.join(stdout_output)
+
+    # this returns a status code we should check
+    p.wait()
+
+    return sha256(stdout_output).hexdigest()
+
+
+def _render_with_pydot(filename):
+    g = pydot.graph_from_dot_file(filename)
+    if not isinstance(g, list):
+        g = [g]
+    jpe_data = NULL_SEP.join([_g.create(format='jpe') for _g in g])
+    return sha256(jpe_data).hexdigest()
+
+
 def test_render_and_compare_dot_files(filepath):
-    def _render_with_graphviz(filename):
-        p = subprocess.Popen(
-            (DOT_BINARY_PATH, '-Tjpe'),
-            cwd=os.path.dirname(filename),
-            stdin=open(filename, 'rt'),
-            stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-
-        stdout = p.stdout
-
-        stdout_output = list()
-        while True:
-            data = stdout.read()
-            if not data:
-                break
-            stdout_output.append(data)
-        stdout.close()
-
-        if stdout_output:
-            stdout_output = NULL_SEP.join(stdout_output)
-
-        # this returns a status code we should check
-        p.wait()
-
-        return sha256(stdout_output).hexdigest()
-
-    def _render_with_pydot(filename):
-        g = pydot.graph_from_dot_file(filename)
-        if not isinstance(g, list):
-            g = [g]
-        jpe_data = NULL_SEP.join([_g.create(format='jpe') for _g in g])
-        return sha256(jpe_data).hexdigest()
     parsed_data_hexdigest = _render_with_pydot(filepath)
     original_data_hexdigest = _render_with_graphviz(filepath)
 
     assert original_data_hexdigest == parsed_data_hexdigest
+
+
+def test_graph_with_shapefiles():
+    shapefile_dir = os.path.join(TEST_DIR, 'from-past-to-future')
+    dot_file = os.path.join(shapefile_dir, 'from-past-to-future.dot')
+
+    pngs = [
+        os.path.join(shapefile_dir, fname)
+        for fname in os.listdir(shapefile_dir)
+        if fname.endswith('.png')]
+
+    with open(dot_file, 'rt') as f:
+        graph_data = f.read()
+    #
+    g = pydot.graph_from_dot_data(graph_data)
+    g.set_shape_files(pngs)
+    jpe_data = g.create(format='jpe')
+    hexdigest = sha256(jpe_data).hexdigest()
+    hexdigest_original = _render_with_graphviz(dot_file)
+
+    assert hexdigest == hexdigest_original