Commit 9ddf4afd authored by Jérome Perrin's avatar Jérome Perrin

Merge remote-tracking branch 'upstream/master' into zope4py2

parents 783f0b79 8633dc9c
......@@ -108,19 +108,24 @@ class MariaDBTestCase(ERP5InstanceTestCase):
class TestCrontabs(MariaDBTestCase, CrontabMixin):
_save_instance_file_pattern_list = \
MariaDBTestCase._save_instance_file_pattern_list + (
'*/srv/backup/*',
)
def test_full_backup(self):
# type: () -> None
self._executeCrontabAtDate('mariadb-backup', '2050-01-01')
with gzip.open(
full_backup_file, = glob.glob(
os.path.join(
self.computer_partition_root_path,
'srv',
'backup',
'mariadb-full',
'20500101000000.sql.gz',
),
'rt') as dump:
'205001010000??.sql.gz',
))
with gzip.open(full_backup_file, 'rt') as dump:
self.assertIn('CREATE TABLE', dump.read())
def test_logrotate_and_slow_query_digest(self):
......@@ -193,6 +198,7 @@ class TestCrontabs(MariaDBTestCase, CrontabMixin):
"Expected slowest query : 0.1 and current is: 3\n",
)
class TestMariaDB(MariaDBTestCase):
def test_utf8_collation(self):
# type: () -> None
......
......@@ -96,18 +96,24 @@ class MariaDBTestCase(ERP5InstanceTestCase):
class TestCrontabs(MariaDBTestCase, CrontabMixin):
_save_instance_file_pattern_list = \
MariaDBTestCase._save_instance_file_pattern_list + (
'*/srv/backup/*',
)
def test_full_backup(self):
# type: () -> None
self._executeCrontabAtDate('mariadb-backup', '2050-01-01')
with gzip.open(
full_backup_file, = glob.glob(
os.path.join(
self.computer_partition_root_path,
'srv',
'backup',
'mariadb-full',
'20500101000000.sql.gz',
),
'rt') as dump:
'205001010000??.sql.gz',
))
with gzip.open(full_backup_file, 'rt') as dump:
self.assertIn('CREATE TABLE', dump.read())
def test_logrotate_and_slow_query_digest(self):
......
......@@ -203,7 +203,7 @@ itsdangerous = 0.24
jdcal = 1.4
jedi = 0.17.2
Jinja2 = 2.11.3
jsonschema = 3.0.2:whl
jsonschema = 4.17.3:whl
jupyter = 1.0.0
jupyter-client = 7.3.1
jupyter-console = 6.4.4
......@@ -235,7 +235,7 @@ packaging = 16.8
pandocfilters = 1.4.3
paramiko = 2.11.0
parso = 0.7.1
passlib = 1.7.1
passlib = 1.7.4
pathlib2 = 2.3.5
patsy = 0.5.1
pbr = 5.9.0
......@@ -337,6 +337,7 @@ distro = 1.6.0
feedparser = 5.2.1
gitdb2 = 2.0.5
GitPython = 2.1.11
jsonschema = 3.0.2:whl
pyparsing = 2.2.0
pyrsistent = 0.16.1
requests = 2.27.1
......
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