When running tests via run.sh, default setting of None would cause
failed directory symlink to appear in vpp workspace with an ugly name.
This patch places the symlink in temporary directory.
Type: fix
Fixes:
b23ffd7ef216463c35b75c831e6a27e58971f4ec
Signed-off-by: Klement Sekera <klement.sekera@gmail.com>
Change-Id: Ic1715eba7ac1f82f71855e2aeb9b659d27bbb3af
import argparse
import os
import psutil
import argparse
import os
import psutil
"--failed-dir",
action="store",
type=directory,
"--failed-dir",
action="store",
type=directory,
- help="directory containing failed tests",
+ help="directory containing failed tests (default: --tmp-dir)",
)
filter_help_string = """\
)
filter_help_string = """\
"--keep-pcaps",
action="store_true",
default=default_keep_pcaps,
"--keep-pcaps",
action="store_true",
default=default_keep_pcaps,
- help="if set, keep all pcap files from a test run"
- f" (default: {default_keep_pcaps})",
+ help=f"if set, keep all pcap files from a test run (default: {default_keep_pcaps})",
)
config = parser.parse_args()
)
config = parser.parse_args()
if config.venv_dir is None:
config.venv_dir = f"{ws}/test/venv"
if config.venv_dir is None:
config.venv_dir = f"{ws}/test/venv"
+if config.failed_dir is None:
+ config.failed_dir = f"{config.tmp_dir}"
+
available_cpus = psutil.Process().cpu_affinity()
num_cpus = len(available_cpus)
available_cpus = psutil.Process().cpu_affinity()
num_cpus = len(available_cpus)
import os
import fnmatch
import unittest
import os
import fnmatch
import unittest
import time
import threading
import traceback
import time
import threading
import traceback
from multiprocessing import Process, Pipe, get_context
from multiprocessing.queues import Queue
from multiprocessing.managers import BaseManager
from multiprocessing import Process, Pipe, get_context
from multiprocessing.queues import Queue
from multiprocessing.managers import BaseManager
from config import config, num_cpus, available_cpus, max_vpp_cpus
from framework import (
VppTestRunner,
from config import config, num_cpus, available_cpus, max_vpp_cpus
from framework import (
VppTestRunner,
TEST_RUN,
SKIP_CPU_SHORTAGE,
)
TEST_RUN,
SKIP_CPU_SHORTAGE,
)
-from debug import spawn_gdb, start_vpp_in_gdb
+from debug import spawn_gdb
from log import (
get_parallel_logger,
double_line_delim,
from log import (
get_parallel_logger,
double_line_delim,
if last_test_temp_dir:
# Need to create link in case of a timeout or core dump without failure
lttd = os.path.basename(last_test_temp_dir)
if last_test_temp_dir:
# Need to create link in case of a timeout or core dump without failure
lttd = os.path.basename(last_test_temp_dir)
- link_path = "%s%s-FAILED" % (config.failed_dir, lttd)
+ link_path = os.path.join(config.failed_dir, f"{lttd}-FAILED")
if not os.path.exists(link_path):
os.symlink(last_test_temp_dir, link_path)
logger.error(
if not os.path.exists(link_path):
os.symlink(last_test_temp_dir, link_path)
logger.error(