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

scripts/common/shell_command.py

@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-import os
-import subprocess
-
-def run_cmd(command: str, env: dict = None, logfile: str = None) -> int:
-    """
-    Args:
-        command: command to run
-        logfile: log file name
-        env:     dictionary holding key-value pairs for bash environment variables
-    Returns:
-        int: The exit status of the command. Exit status codes are:
-            0     -> Success
-            1-255 -> Failure
-    """
-    if logfile is None:
-        logfile = os.devnull
-    if env is None:
-        env = os.environ.copy()
-    with open(
-        file=logfile,
-        mode='w',
-        encoding='utf8'
-    ) as log:
-        ret = subprocess.run(
-            command,
-            shell=True,
-            check=True,
-            executable='/bin/bash',
-            env=env,
-            stdout=log if not logfile else None,
-            stderr=None
-        )
-        return ret.returncode

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

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"

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")/../..")
 

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")/../..")
 

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")/../..")
 

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")/../..")
 

test/external_tests.py

@@ -23,13 +23,7 @@ from argparse import ArgumentParser, Namespace
 import os
 from pathlib import Path
 import sys
-
+import subprocess
-# 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
 
 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"
     }