Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grass.gunittest: Add --config parameter #2182

Merged
merged 1 commit into from
Feb 8, 2022
Merged
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
38 changes: 29 additions & 9 deletions python/grass/gunittest/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,28 @@ def discovery():
CONFIG_FILENAME = ".gunittest.cfg"


def get_config(start_directory):
"""Read configuration if available, return empty dict if not"""
def get_config(start_directory, config_file):
"""Read configuration if available, return empty section proxy if not

If file is explicitly specified, it must exist.

Raises OSError if file is not accessible, e.g., if it exists,
but there is an issue with permissions.
"""
config_parser = configparser.ConfigParser()
config_file = Path(start_directory) / CONFIG_FILENAME
if config_file.is_file():
if config_file:
with open(config_file, encoding="utf-8") as file:
config_parser.read_file(file)
elif start_directory:
config_file = Path(start_directory) / CONFIG_FILENAME
# Does not check presence of the file
config_parser.read(config_file)
else:
# Create an empty section if file is not available.
raise ValueError("Either start_directory or config_file must be set")
if "gunittest" not in config_parser:
# Create an empty section if file is not available or section is not present.
config_parser.read_dict({"gunittest": {}})
if "gunittest" in config_parser:
return config_parser["gunittest"]
return config_parser
return config_parser["gunittest"]


def main():
Expand Down Expand Up @@ -190,6 +200,13 @@ def main():
" than this will result in a non-zero return code; values 0-100)"
),
)
parser.add_argument(
"--config",
dest="config",
action="store",
type=str,
help=f"Path to a configuration file (default: {CONFIG_FILENAME})",
)
args = parser.parse_args()
gisdbase = args.gisdbase
if gisdbase is None:
Expand Down Expand Up @@ -222,7 +239,10 @@ def main():
start_dir = "."
abs_start_dir = os.path.abspath(start_dir)

config = get_config(start_dir)
try:
config = get_config(start_directory=start_dir, config_file=args.config)
except OSError as error:
return f"Error reading configuration: {error}"

invoker = GrassTestFilesInvoker(
start_dir=start_dir,
Expand Down