From e5184aad0e2c9a1de760de1930481961639287e8 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Sun, 16 Jun 2019 19:01:38 -0700 Subject: [PATCH] removed redundant try block from file copy, changed shutil.copyfile to shutil.copy --- ci/ci_test.py | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/ci/ci_test.py b/ci/ci_test.py index dcf2457..da805ce 100644 --- a/ci/ci_test.py +++ b/ci/ci_test.py @@ -11,27 +11,23 @@ working_directory = os.path.dirname(os.path.abspath(__file__)) def ci_config(): """Copies test configuration files to usable config files""" - try: - logger.info("Migrating test config files...") - config_dir = os.path.join(working_directory, "hyperglass/configuration/") - ci_dir = os.path.join(working_directory, "ci/") - test_files = glob.iglob(os.path.join(ci_dir, "*.toml")) - status = False - for f in test_files: - if os.path.exists(f): - raise RuntimeError(f"{f} already exists") - else: - try: - shutil.copyfile(f, config_dir) - logger.info("Successfully migrated test config files") - status = True - except: - logger.error(f"Failed to migrate {f}") - raise - return status - except: - logger.error("Error migrating test config files") - raise + logger.info("Migrating test config files...") + config_dir = os.path.join(working_directory, "hyperglass/configuration/") + ci_dir = os.path.join(working_directory, "ci/") + test_files = glob.iglob(os.path.join(ci_dir, "*.toml")) + status = False + for f in test_files: + if os.path.exists(f): + raise RuntimeError(f"{f} already exists") + else: + try: + shutil.copy(f, config_dir) + logger.info("Successfully migrated test config files") + status = True + except: + logger.error(f"Failed to migrate {f}") + raise + return status def construct_test(test_query, location, test_target):