Commit f94d260c authored by Jérome Perrin's avatar Jérome Perrin

Testcase fixes

The example from `software/slapos-sr-testing/README.md` in slapos repository uses a path with `~` for shared parts, but this was not supported.

Also, what was not supported is to use `setUpModule` more than once, but erp5 SR tests are starting to do this.

See merge request !196
parents 76a34d1d ce20567a
Pipeline #8719 passed with stage
in 0 seconds
...@@ -62,8 +62,10 @@ def makeModuleSetUpAndTestCaseClass( ...@@ -62,8 +62,10 @@ def makeModuleSetUpAndTestCaseClass(
ipv6_address=os.environ['SLAPOS_TEST_IPV6'], ipv6_address=os.environ['SLAPOS_TEST_IPV6'],
debug=bool(int(os.environ.get('SLAPOS_TEST_DEBUG', 0))), debug=bool(int(os.environ.get('SLAPOS_TEST_DEBUG', 0))),
verbose=bool(int(os.environ.get('SLAPOS_TEST_VERBOSE', 0))), verbose=bool(int(os.environ.get('SLAPOS_TEST_VERBOSE', 0))),
shared_part_list=os.environ.get('SLAPOS_TEST_SHARED_PART_LIST', shared_part_list=[
'').split(os.pathsep), os.path.expanduser(p) for p in os.environ.get(
'SLAPOS_TEST_SHARED_PART_LIST', '').split(os.pathsep)
],
snapshot_directory=os.environ.get('SLAPOS_TEST_LOG_DIRECTORY'), snapshot_directory=os.environ.get('SLAPOS_TEST_LOG_DIRECTORY'),
): ):
# type: (str, str, str, str, bool, bool, Iterable[str], Optional[str]) -> Tuple[Callable[[], None], Type[SlapOSInstanceTestCase]] # type: (str, str, str, str, bool, bool, Iterable[str], Optional[str]) -> Tuple[Callable[[], None], Type[SlapOSInstanceTestCase]]
...@@ -329,6 +331,8 @@ def installSoftwareUrlList(cls, software_url_list, max_retry=2, debug=False): ...@@ -329,6 +331,8 @@ def installSoftwareUrlList(cls, software_url_list, max_retry=2, debug=False):
cls._copySnapshot(standalone_log, name) cls._copySnapshot(standalone_log, name)
try: try:
cls.logger.debug("Starting")
cls.slap.start()
for software_url in software_url_list: for software_url in software_url_list:
cls.logger.debug("Supplying %s", software_url) cls.logger.debug("Supplying %s", software_url)
cls.slap.supply(software_url) cls.slap.supply(software_url)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment