Commit 68ea12db authored by Jérome Perrin's avatar Jérome Perrin

slapos/testing: log crontab output

Don't pollute console output, store this in log file
parent dce7b95b
...@@ -30,6 +30,7 @@ import socket ...@@ -30,6 +30,7 @@ import socket
import hashlib import hashlib
import unittest import unittest
import os import os
import logging
import multiprocessing import multiprocessing
import shutil import shutil
import subprocess import subprocess
...@@ -194,6 +195,7 @@ class ManagedTemporaryDirectory(ManagedResource): ...@@ -194,6 +195,7 @@ class ManagedTemporaryDirectory(ManagedResource):
class CrontabMixin(object): class CrontabMixin(object):
computer_partition_root_path = None # type: str computer_partition_root_path = None # type: str
logger = None # type: logging.Logger
def _getCrontabCommand(self, crontab_name): def _getCrontabCommand(self, crontab_name):
# type: (str) -> str # type: (str) -> str
"""Read a crontab and return the command that is executed. """Read a crontab and return the command that is executed.
...@@ -216,11 +218,12 @@ class CrontabMixin(object): ...@@ -216,11 +218,12 @@ class CrontabMixin(object):
be a relative time. be a relative time.
""" """
crontab_command = self._getCrontabCommand(crontab_name) crontab_command = self._getCrontabCommand(crontab_name)
subprocess.check_call( crontab_output = subprocess.check_output(
# XXX we unset PYTHONPATH set by `setup.py test` # XXX we unset PYTHONPATH set by `setup.py test`
"env PYTHONPATH= faketime {date} bash -o pipefail -e -c '{crontab_command}'".format(**locals()), "env PYTHONPATH= faketime {date} bash -o pipefail -e -c '{crontab_command}'".format(**locals()),
shell=True, shell=True,
) )
self.logger.debug("crontab %s output: %s", crontab_command, crontab_output)
class ImageComparisonTestCase(unittest.TestCase): class ImageComparisonTestCase(unittest.TestCase):
......
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