From 12440ea1af8e60482a6a91c1cb04dcb86d7f4a68 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Wed, 6 Sep 2023 13:37:34 -0500
Subject: conf-mode: T5412: move dependency check from smoketest to nosetest

---
 smoketest/scripts/cli/test_dependency_graph.py | 54 --------------------------
 src/tests/test_dependency_graph.py             | 31 +++++++++++++++
 2 files changed, 31 insertions(+), 54 deletions(-)
 delete mode 100755 smoketest/scripts/cli/test_dependency_graph.py
 create mode 100644 src/tests/test_dependency_graph.py

diff --git a/smoketest/scripts/cli/test_dependency_graph.py b/smoketest/scripts/cli/test_dependency_graph.py
deleted file mode 100755
index 45a40acc4..000000000
--- a/smoketest/scripts/cli/test_dependency_graph.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2022 VyOS maintainers and contributors
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 or later as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import json
-import unittest
-from graphlib import TopologicalSorter, CycleError
-
-DEP_FILE = '/usr/share/vyos/config-mode-dependencies.json'
-
-def graph_from_dict(d):
-    g = {}
-    for k in list(d):
-        g[k] = set()
-        # add the dependencies for every sub-case; should there be cases
-        # that are mutally exclusive in the future, the graphs will be
-        # distinguished
-        for el in list(d[k]):
-            g[k] |= set(d[k][el])
-    return g
-
-class TestDependencyGraph(unittest.TestCase):
-    def setUp(self):
-        with open(DEP_FILE) as f:
-            dd = json.load(f)
-            self.dependency_graph = graph_from_dict(dd)
-
-    def test_cycles(self):
-        ts = TopologicalSorter(self.dependency_graph)
-        out = None
-        try:
-            # get node iterator
-            order = ts.static_order()
-            # try iteration
-            _ = [*order]
-        except CycleError as e:
-            out = e.args
-
-        self.assertIsNone(out)
-
-if __name__ == '__main__':
-    unittest.main(verbosity=2)
diff --git a/src/tests/test_dependency_graph.py b/src/tests/test_dependency_graph.py
new file mode 100644
index 000000000..f682e87bb
--- /dev/null
+++ b/src/tests/test_dependency_graph.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2023 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+from vyos.configdep import check_dependency_graph
+
+_here = os.path.dirname(__file__)
+ddir = os.path.join(_here, '../../data/config-mode-dependencies')
+
+from unittest import TestCase
+
+class TestDependencyGraph(TestCase):
+    def setUp(self):
+        pass
+
+    def test_acyclic(self):
+        res = check_dependency_graph(dependency_dir=ddir)
+        self.assertTrue(res)
-- 
cgit v1.2.3