Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import sys
import time


sys.path.insert(0, "../../../lib/")
sys.path.insert(1, "../../")
import py_test_lib # nopep8
Expand All @@ -19,7 +18,6 @@
from multinode.tradefed.utils import * # nopep8
from multinode.tradefed.sts_util import StsUtil # nopep8


OUTPUT = "%s/output" % os.getcwd()
RESULT_FILE = "%s/result.txt" % OUTPUT
TRADEFED_STDOUT = "%s/tradefed-stdout.txt" % OUTPUT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
sys.path.insert(0, "../../lib/")
import py_test_lib # nopep8


OUTPUT = "%s/output" % os.getcwd()
RESULT_FILE = "%s/result.txt" % OUTPUT
TRADEFED_STDOUT = "%s/tradefed-stdout.txt" % OUTPUT
Expand Down
1 change: 0 additions & 1 deletion automated/android/tradefed/tradefed-runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
sys.path.insert(0, "../../lib/")
import py_test_lib # nopep8


OUTPUT = "%s/output" % os.getcwd()
RESULT_FILE = "%s/result.txt" % OUTPUT
TRADEFED_STDOUT = "%s/tradefed-stdout.txt" % OUTPUT
Expand Down
1 change: 0 additions & 1 deletion automated/lib/android_adb_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import subprocess
import time


ADB_DEVICES_PATTERN = re.compile(r"^([a-z0-9-]+)\s+device$", flags=re.M)


Expand Down
1 change: 0 additions & 1 deletion automated/linux/tcpreplay/pcap/generate_pcap.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
fragment,
)


test_expectations = {
"tcp_basic.pcap": "pass",
"tcp_data.pcap": "pass",
Expand Down
49 changes: 16 additions & 33 deletions automated/utils/test-runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from uuid import uuid4
from datetime import datetime


try:
from squad_client.core.api import SquadApi
from squad_client.shortcuts import submit_results
Expand Down Expand Up @@ -1122,37 +1121,31 @@ def get_args():
"--output",
default=os.getenv("HOME", "") + "/output",
dest="output",
help=textwrap.dedent(
"""\
help=textwrap.dedent("""\
specify a directory to store test and result files.
Default: $HOME/output
"""
),
"""),
)
parser.add_argument(
"-p",
"--test_plan",
default=None,
dest="test_plan",
help=textwrap.dedent(
"""\
help=textwrap.dedent("""\
specify a test plan file which has tests and related
params listed in yaml format.
"""
),
"""),
)
parser.add_argument(
"-d",
"--test_def",
default=None,
dest="test_def",
help=textwrap.dedent(
"""\
help=textwrap.dedent("""\
base on test definition repo location, specify relative
path to the test definition to run.
Format example: "ubuntu/smoke-tests-basic.yaml"
"""
),
"""),
)
parser.add_argument(
"-r",
Expand All @@ -1162,27 +1155,23 @@ def get_args():
action=StoreDictKeyPair,
nargs="+",
metavar="KEY=VALUE",
help=textwrap.dedent(
"""\
help=textwrap.dedent("""\
Set additional parameters when using test definition without
a test plan. The name values are set similarily to environment
variables:
--test_def_params KEY1=VALUE1 KEY2=VALUE2 ...
"""
),
"""),
)
parser.add_argument(
"-k",
"--kind",
default="automated",
dest="kind",
choices=["automated", "manual"],
help=textwrap.dedent(
"""\
help=textwrap.dedent("""\
Selects type of tests to be executed from the test plan.
Possible options: automated, manual
"""
),
"""),
)
parser.add_argument(
"-t",
Expand All @@ -1197,13 +1186,11 @@ def get_args():
"--target",
default=None,
dest="target",
help=textwrap.dedent(
"""\
help=textwrap.dedent("""\
Specify SSH target to execute tests.
Format: user@host
Note: ssh authentication must be paswordless
"""
),
"""),
)
parser.add_argument(
"-s",
Expand Down Expand Up @@ -1234,14 +1221,12 @@ def get_args():
"--overlay",
default=None,
dest="overlay",
help=textwrap.dedent(
"""\
help=textwrap.dedent("""\
Specify test plan overlay file to:
* skip tests
* amend test parameters
* add new tests
"""
),
"""),
)
parser.add_argument(
"-v",
Expand Down Expand Up @@ -1314,14 +1299,12 @@ def get_args():
dest="cleanup",
default=False,
action="store_true",
help=textwrap.dedent(
"""\
help=textwrap.dedent("""\
If set to true, test-runner will remove all temporary files after
running the test. It includes all collected logs and test results. This
option should only be used if uploading results to SQUAD or LAVA.
Default: false
"""
),
"""),
)

args = parser.parse_args()
Expand Down
1 change: 0 additions & 1 deletion plans/testplan2html.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
from csv import DictWriter
from jinja2 import Environment, FileSystemLoader


logger = logging.getLogger()


Expand Down