FAQ | This is a LIVE service | Changelog

Skip to content
Snippets Groups Projects
Commit 150c301d authored by L. Bower's avatar L. Bower
Browse files

adding a check for loading resource files before all partial integration tests...

adding a check for loading resource files before all partial integration tests begin. Allows the user to spot if they have not set their working dir correctly
parent 01a713ad
No related branches found
No related tags found
No related merge requests found
...@@ -3,8 +3,6 @@ import datetime ...@@ -3,8 +3,6 @@ import datetime
import glob import glob
import json import json
import os import os
import sys
import unittest
from importlib import reload from importlib import reload
from typing import List from typing import List
from unittest import TestSuite, TestLoader, TestCase, TestResult from unittest import TestSuite, TestLoader, TestCase, TestResult
...@@ -29,6 +27,18 @@ class IntegrationTestUtils: ...@@ -29,6 +27,18 @@ class IntegrationTestUtils:
TEST_START_DATE: str = None TEST_START_DATE: str = None
TEST_JOB_DIR: str = None TEST_JOB_DIR: str = None
@staticmethod
def check_resources_exist():
"""
do a single check for the email cred file, which will raise an error suggesting that the user may not have set
their pythonpath correctly
"""
emailcred_exists = os.path.exists(IntegrationTestUtils.EMAIL_CRED_PATH)
if not emailcred_exists:
raise FileNotFoundError(f"email cred file {IntegrationTestUtils.EMAIL_CRED_PATH} not found - have you set "
f"the working directory to the same directory as the tests you are running?"
f" (tests use a path relative to the test directory)")
@staticmethod @staticmethod
def build_arg_parser() -> argparse.ArgumentParser: def build_arg_parser() -> argparse.ArgumentParser:
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
......
import sys import sys
import unittest
from unittest import TestLoader, TestSuite, TestResult from unittest import TestLoader, TestSuite, TestResult
import HtmlTestRunner
from HtmlTestRunner import HTMLTestRunner from HtmlTestRunner import HTMLTestRunner
from HtmlTestRunner.result import HtmlTestResult
from integration.partial.test_advisory import TestAdvisory
from integration.partial.test_deposition import TestDeposition from integration.partial.test_deposition import TestDeposition
from integration.partial.test_env_suit import TestEnvSuit from integration.partial.test_env_suit import TestEnvSuit
from integration.partial.test_survey import TestSurvey from integration.partial.test_survey import TestSurvey
from integration.partial.test_advisory import TestAdvisory
def build_test_runner() -> TestSuite: def build_test_runner() -> TestSuite:
......
...@@ -26,6 +26,7 @@ class TestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite): ...@@ -26,6 +26,7 @@ class TestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite):
def setUp(self) -> None: def setUp(self) -> None:
IntegrationTestUtils.check_resources_exist()
self.set_expected_values() self.set_expected_values()
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH): if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
......
...@@ -28,6 +28,7 @@ class TestDeposition(BaseDepoTestSuite.DepoTestSuite): ...@@ -28,6 +28,7 @@ class TestDeposition(BaseDepoTestSuite.DepoTestSuite):
def setUp(self) -> None: def setUp(self) -> None:
IntegrationTestUtils.check_resources_exist()
self.set_expected_values() self.set_expected_values()
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH): if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
......
...@@ -26,6 +26,8 @@ class TestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite): ...@@ -26,6 +26,8 @@ class TestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
self.ETH_PNG_COUNT = 6 self.ETH_PNG_COUNT = 6
def setUp(self) -> None: def setUp(self) -> None:
IntegrationTestUtils.check_resources_exist()
self.set_expected_values() self.set_expected_values()
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir( if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(
......
...@@ -24,6 +24,7 @@ class TestEpi(BaseEpiTestSuite.EpiTestSuite): ...@@ -24,6 +24,7 @@ class TestEpi(BaseEpiTestSuite.EpiTestSuite):
def setUp(self) -> None: def setUp(self) -> None:
IntegrationTestUtils.check_resources_exist()
self.set_expected_values() self.set_expected_values()
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH): if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(IntegrationTestUtils.TEST_OUT_PATH):
......
...@@ -23,6 +23,7 @@ class TestSurvey(BaseSurveyTestSuite.SurveyTestSuite): ...@@ -23,6 +23,7 @@ class TestSurvey(BaseSurveyTestSuite.SurveyTestSuite):
def setUp(self) -> None: def setUp(self) -> None:
IntegrationTestUtils.check_resources_exist()
self.set_expected_values() self.set_expected_values()
if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir( if IntegrationTestUtils.TEST_OUT_PATH is None or not os.path.isdir(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment