refactor: rename old_tests/ to system_tests/

dlshriver · Dec 6, 2021 · ca562da · ca562da
1 parent 92dada1
commit ca562da
Show file tree

Hide file tree

Showing 40 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -79,7 +79,7 @@ jobs:
       - name: Prepare Test Artifacts
         run: |
           . .venv/bin/activate
-          python tests/old_tests/artifacts/build_artifacts.py
+          python tests/system_tests/artifacts/build_artifacts.py
 
       - name: Run DNNV Test Suite
         run: |

diff --git a/.gitignore b/.gitignore
@@ -115,10 +115,10 @@ ENV/
 /share/
 /data/
 /artifacts/
-/tests/old_tests/artifacts/networks/*.onnx
-!/tests/old_tests/artifacts/networks/dave.onnx
-!/tests/old_tests/artifacts/networks/dronet.onnx
-!/tests/old_tests/artifacts/networks/convSmallRELU__Point.onnx
-!/tests/old_tests/artifacts/networks/mnist_relu_3_50.onnx
-!/tests/old_tests/artifacts/networks/mnist_300_200_100.onnx
+*.onnx
+!/tests/system_tests/artifacts/networks/dave.onnx
+!/tests/system_tests/artifacts/networks/dronet.onnx
+!/tests/system_tests/artifacts/networks/convSmallRELU__Point.onnx
+!/tests/system_tests/artifacts/networks/mnist_relu_3_50.onnx
+!/tests/system_tests/artifacts/networks/mnist_300_200_100.onnx
 .dnnv/
diff --git a/Dockerfile b/Dockerfile
@@ -44,8 +44,8 @@ COPY --chown=dnnv dnnv/__init__.py dnnv/__version__.py dnnv/
 RUN . .venv/bin/activate && flit install -s
 
 # build test artifacts
-COPY --chown=dnnv tests/old_tests/artifacts/build_artifacts.py tests/old_tests/artifacts/build_artifacts.py
-RUN . .venv/bin/activate && python tests/old_tests/artifacts/build_artifacts.py
+COPY --chown=dnnv tests/system_tests/artifacts/build_artifacts.py tests/system_tests/artifacts/build_artifacts.py
+RUN . .venv/bin/activate && python tests/system_tests/artifacts/build_artifacts.py
 
 # copy project files to container
 COPY --chown=dnnv . .

diff --git a/pyproject.toml b/pyproject.toml
@@ -62,7 +62,7 @@ dnnv_manage = "dnnv._manage.__main__:_main"
 
 [tool.coverage.run]
 branch = true
-command_line = "-m pytest tests/unit_tests tests/old_tests/verifiers_tests --ff --verbose --import-mode=importlib --full-trace"
+command_line = "-m pytest tests/unit_tests tests/system_tests --ff --verbose --import-mode=importlib --full-trace"
 parallel = true
 source = ["dnnv"]
 omit = [

diff --git a/tests/old_tests/artifacts/build_artifacts.py → ...system_tests/artifacts/build_artifacts.py b/tests/old_tests/artifacts/build_artifacts.py → ...system_tests/artifacts/build_artifacts.py
diff --git a/...ifacts/networks/convSmallRELU__Point.onnx → ...ifacts/networks/convSmallRELU__Point.onnx b/...ifacts/networks/convSmallRELU__Point.onnx → ...ifacts/networks/convSmallRELU__Point.onnx
diff --git a/tests/old_tests/artifacts/networks/dave.onnx → ...system_tests/artifacts/networks/dave.onnx b/tests/old_tests/artifacts/networks/dave.onnx → ...system_tests/artifacts/networks/dave.onnx
diff --git a/.../old_tests/artifacts/networks/dronet.onnx → ...stem_tests/artifacts/networks/dronet.onnx b/.../old_tests/artifacts/networks/dronet.onnx → ...stem_tests/artifacts/networks/dronet.onnx
diff --git a/...artifacts/networks/mnist_300_200_100.onnx → ...artifacts/networks/mnist_300_200_100.onnx b/...artifacts/networks/mnist_300_200_100.onnx → ...artifacts/networks/mnist_300_200_100.onnx
diff --git a/...s/artifacts/networks/mnist_relu_3_50.onnx → ...s/artifacts/networks/mnist_relu_3_50.onnx b/...s/artifacts/networks/mnist_relu_3_50.onnx → ...s/artifacts/networks/mnist_relu_3_50.onnx
diff --git a/...cts/properties/class_localrobustness_0.py → ...cts/properties/class_localrobustness_0.py b/...cts/properties/class_localrobustness_0.py → ...cts/properties/class_localrobustness_0.py
diff --git a/...cts/properties/class_localrobustness_1.py → ...cts/properties/class_localrobustness_1.py b/...cts/properties/class_localrobustness_1.py → ...cts/properties/class_localrobustness_1.py
diff --git a/...ifacts/properties/hyperlocalrobustness.py → ...ifacts/properties/hyperlocalrobustness.py b/...ifacts/properties/hyperlocalrobustness.py → ...ifacts/properties/hyperlocalrobustness.py
diff --git a/...s/artifacts/properties/localrobustness.py → ...s/artifacts/properties/localrobustness.py b/...s/artifacts/properties/localrobustness.py → ...s/artifacts/properties/localrobustness.py
diff --git a/.../properties/mnist_localrobustness_rand.py → .../properties/mnist_localrobustness_rand.py b/.../properties/mnist_localrobustness_rand.py → .../properties/mnist_localrobustness_rand.py
diff --git a/...cts/properties/mnist_localrobustness_x.py → ...cts/properties/mnist_localrobustness_x.py b/...cts/properties/mnist_localrobustness_x.py → ...cts/properties/mnist_localrobustness_x.py
diff --git a/...ests/artifacts/properties/output_ge1_0.py → ...ests/artifacts/properties/output_ge1_0.py b/...ests/artifacts/properties/output_ge1_0.py → ...ests/artifacts/properties/output_ge1_0.py
diff --git a/...ests/artifacts/properties/output_ge1_1.py → ...ests/artifacts/properties/output_ge1_1.py b/...ests/artifacts/properties/output_ge1_1.py → ...ests/artifacts/properties/output_ge1_1.py
diff --git a/...roperties/regression_localrobustness_0.py → ...roperties/regression_localrobustness_0.py b/...roperties/regression_localrobustness_0.py → ...roperties/regression_localrobustness_0.py
diff --git a/.../old_tests/artifacts/properties/true_0.py → ...stem_tests/artifacts/properties/true_0.py b/.../old_tests/artifacts/properties/true_0.py → ...stem_tests/artifacts/properties/true_0.py
diff --git a/.../old_tests/artifacts/properties/true_1.py → ...stem_tests/artifacts/properties/true_1.py b/.../old_tests/artifacts/properties/true_1.py → ...stem_tests/artifacts/properties/true_1.py
diff --git a/.../old_tests/artifacts/properties/true_2.py → ...stem_tests/artifacts/properties/true_2.py b/.../old_tests/artifacts/properties/true_2.py → ...stem_tests/artifacts/properties/true_2.py
diff --git a/tests/old_tests/conftest.py → tests/system_tests/conftest.py b/tests/old_tests/conftest.py → tests/system_tests/conftest.py
diff --git a/tests/old_tests/utils.py → tests/system_tests/utils.py b/tests/old_tests/utils.py → tests/system_tests/utils.py
diff --git a/tests/old_tests/verifiers_tests/__init__.py → .../system_tests/verifiers_tests/__init__.py b/tests/old_tests/verifiers_tests/__init__.py → .../system_tests/verifiers_tests/__init__.py
diff --git a/tests/old_tests/verifiers_tests/bab_tests.py → ...system_tests/verifiers_tests/bab_tests.py b/tests/old_tests/verifiers_tests/bab_tests.py → ...system_tests/verifiers_tests/bab_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.bab import BaB
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not BaB.is_installed(), "BaB is not installed")

diff --git a/.../old_tests/verifiers_tests/babsb_tests.py → ...stem_tests/verifiers_tests/babsb_tests.py b/.../old_tests/verifiers_tests/babsb_tests.py → ...stem_tests/verifiers_tests/babsb_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.babsb import BaBSB
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not BaBSB.is_installed(), "BaBSB is not installed")

diff --git a/.../verifiers_tests/common_tests/__init__.py → .../verifiers_tests/common_tests/__init__.py b/.../verifiers_tests/common_tests/__init__.py → .../verifiers_tests/common_tests/__init__.py
diff --git a/...fiers_tests/common_tests/results_tests.py → ...fiers_tests/common_tests/results_tests.py b/...fiers_tests/common_tests/results_tests.py → ...fiers_tests/common_tests/results_tests.py
diff --git a/...s/old_tests/verifiers_tests/eran_tests.py → ...ystem_tests/verifiers_tests/eran_tests.py b/...s/old_tests/verifiers_tests/eran_tests.py → ...ystem_tests/verifiers_tests/eran_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.eran import ERAN
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not ERAN.is_installed(), "ERAN is not installed")

diff --git a/...ld_tests/verifiers_tests/marabou_tests.py → ...em_tests/verifiers_tests/marabou_tests.py b/...ld_tests/verifiers_tests/marabou_tests.py → ...em_tests/verifiers_tests/marabou_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.marabou import Marabou
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not Marabou.is_installed(), "Marabou is not installed")

diff --git a/..._tests/verifiers_tests/mipverify_tests.py → ..._tests/verifiers_tests/mipverify_tests.py b/..._tests/verifiers_tests/mipverify_tests.py → ..._tests/verifiers_tests/mipverify_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.mipverify import MIPVerify
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not MIPVerify.is_installed(), "MIPVerify is not installed")

diff --git a/.../old_tests/verifiers_tests/mnist_tests.py → ...stem_tests/verifiers_tests/mnist_tests.py b/.../old_tests/verifiers_tests/mnist_tests.py → ...stem_tests/verifiers_tests/mnist_tests.py
@@ -17,7 +17,7 @@
 from dnnv.verifiers.reluplex import Reluplex
 from dnnv.verifiers.verinet import VeriNet
 
-from old_tests.utils import network_artifact_dir, property_artifact_dir
+from system_tests.utils import network_artifact_dir, property_artifact_dir
 
 RUNS_PER_PROP = int(os.environ.get("_DNNV_TEST_RUNS_PER_PROP", "1"))
 

diff --git a/...ld_tests/verifiers_tests/neurify_tests.py → ...em_tests/verifiers_tests/neurify_tests.py b/...ld_tests/verifiers_tests/neurify_tests.py → ...em_tests/verifiers_tests/neurify_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.neurify import Neurify
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not Neurify.is_installed(), "Neurify is not installed")

diff --git a/...old_tests/verifiers_tests/nnenum_tests.py → ...tem_tests/verifiers_tests/nnenum_tests.py b/...old_tests/verifiers_tests/nnenum_tests.py → ...tem_tests/verifiers_tests/nnenum_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.nnenum import Nnenum
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not Nnenum.is_installed(), "nnenum is not installed")

diff --git a/...old_tests/verifiers_tests/planet_tests.py → ...tem_tests/verifiers_tests/planet_tests.py b/...old_tests/verifiers_tests/planet_tests.py → ...tem_tests/verifiers_tests/planet_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.planet import Planet
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not Planet.is_installed(), "Planet is not installed")

diff --git a/...old_tests/verifiers_tests/random_tests.py → ...tem_tests/verifiers_tests/random_tests.py b/...old_tests/verifiers_tests/random_tests.py → ...tem_tests/verifiers_tests/random_tests.py
@@ -17,7 +17,7 @@
 from dnnv.verifiers.reluplex import Reluplex
 from dnnv.verifiers.verinet import VeriNet
 
-from old_tests.utils import network_artifact_dir, property_artifact_dir
+from system_tests.utils import network_artifact_dir, property_artifact_dir
 
 RUNS_PER_PROP = int(os.environ.get("_DNNV_TEST_RUNS_PER_PROP", "1"))
 

diff --git a/...d_tests/verifiers_tests/reluplex_tests.py → ...m_tests/verifiers_tests/reluplex_tests.py b/...d_tests/verifiers_tests/reluplex_tests.py → ...m_tests/verifiers_tests/reluplex_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.reluplex import Reluplex
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not Reluplex.is_installed(), "Reluplex is not installed")

diff --git a/tests/old_tests/verifiers_tests/utils.py → tests/system_tests/verifiers_tests/utils.py b/tests/old_tests/verifiers_tests/utils.py → tests/system_tests/verifiers_tests/utils.py
@@ -5,7 +5,7 @@
 from dnnv.properties import get_context
 from dnnv.verifiers import SAT, UNSAT, UNKNOWN
 
-from old_tests.utils import network_artifact_dir, property_artifact_dir
+from system_tests.utils import network_artifact_dir, property_artifact_dir
 
 RUNS_PER_PROP = int(os.environ.get("_DNNV_TEST_RUNS_PER_PROP", "1"))
 

diff --git a/...ld_tests/verifiers_tests/verinet_tests.py → ...em_tests/verifiers_tests/verinet_tests.py b/...ld_tests/verifiers_tests/verinet_tests.py → ...em_tests/verifiers_tests/verinet_tests.py
@@ -2,7 +2,7 @@
 
 from dnnv.verifiers.verinet import VeriNet
 
-from old_tests.verifiers_tests.utils import VerifierTests
+from system_tests.verifiers_tests.utils import VerifierTests
 
 
 @unittest.skipIf(not VeriNet.is_installed(), "VeriNet is not installed")