Move common.sh from test/externalTests to scripts/externalTests

ethereum · Apr 28, 2023 · 28a9592 · 28a9592
1 parent 778d6f4
commit 28a9592
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 62 deletions.
diff --git a/scripts/common/shell_command.py b/scripts/common/shell_command.py
diff --git a/test/externalTests/common.sh → scripts/externalTests/common.sh b/test/externalTests/common.sh → scripts/externalTests/common.sh
diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/chainlink.sh b/test/externalTests/chainlink.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 SOLJSON="$1"
 VERSION="$2"

diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
@@ -27,7 +27,7 @@ set -e
 export NODE_OPTIONS="--max-old-space-size=4096"
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 

diff --git a/test/external_tests.py b/test/external_tests.py
@@ -23,13 +23,7 @@
 import os
 from pathlib import Path
 import sys
-
-# Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
-# pragma pylint: disable=import-error,wrong-import-position
-SCRIPTS_DIR = Path(__file__).parents[1] / "scripts"
-sys.path.insert(0, str(SCRIPTS_DIR))
-
-from common.shell_command import run_cmd
+import subprocess
 
 EXTERNAL_TESTS_DIR = Path(__file__).parent / "externalTests"
 
@@ -39,13 +33,10 @@ class ExternalTestNotFound(Exception):
 
 
 def detect_external_tests() -> dict:
-    # TODO: Remove `file_path.stem != "common"` when we complete the migration
-    # of the external tests to python, since there will be no more
-    # common.sh script in the externalTests folder.
     return {
         file_path.stem: file_path
         for file_path in Path(EXTERNAL_TESTS_DIR).iterdir()
-        if file_path.is_file() and file_path.suffix == ".sh" and file_path.stem != "common"
+        if file_path.is_file() and file_path.suffix == ".sh"
     }