Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit265837b

Browse files
committed
tests: minor fixes
1 parent6caf77e commit265837b

File tree

2 files changed

+28
-19
lines changed

2 files changed

+28
-19
lines changed

‎tests/checkdb.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,12 +434,12 @@ def test_checkdb_block_validation_sanity(self):
434434
repr(e.message),self.cmd))
435435

436436
self.assertIn(
437-
"WARNING:CORRUPTIONin file {0}, block 1".format(
437+
'WARNING:Corruption detectedin file"{0}", block 1'.format(
438438
os.path.normpath(heap_full_path)),
439439
e.message)
440440

441441
self.assertIn(
442-
"WARNING:CORRUPTIONin file {0}, block 5".format(
442+
'WARNING:Corruption detectedin file"{0}", block 5'.format(
443443
os.path.normpath(heap_full_path)),
444444
e.message)
445445

‎tests/merge.py‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1941,15 +1941,16 @@ def test_merge_multiple_descendants(self):
19411941
# FULLb OK
19421942
# FULLa OK
19431943

1944-
# Change PAGEa1backup statusto OK
1944+
# Change PAGEa1 to OK
19451945
self.change_backup_status(backup_dir,'node',page_id_a1,'OK')
19461946

1947-
# Change PAGEb1backup status to ERROR
1947+
# Change PAGEb1and FULLb to ERROR
19481948
self.change_backup_status(backup_dir,'node',page_id_b1,'ERROR')
1949+
self.change_backup_status(backup_dir,'node',backup_id_b,'ERROR')
19491950

19501951
# PAGEb1 ERROR
19511952
# PAGEa1 OK
1952-
# FULLbOK
1953+
# FULLbERROR
19531954
# FULLa OK
19541955

19551956
page_id_a2=self.backup_node(
@@ -1958,20 +1959,22 @@ def test_merge_multiple_descendants(self):
19581959
# PAGEa2 OK
19591960
# PAGEb1 ERROR
19601961
# PAGEa1 OK
1961-
# FULLbOK
1962+
# FULLbERROR
19621963
# FULLa OK
19631964

1964-
# Change PAGEb1backup status to OK
1965+
# Change PAGEb1and FULLb to OK
19651966
self.change_backup_status(backup_dir,'node',page_id_b1,'OK')
1967+
self.change_backup_status(backup_dir,'node',backup_id_b,'OK')
19661968

1967-
# Change PAGEa2backup status to ERROR
1969+
# Change PAGEa2and FULL to ERROR
19681970
self.change_backup_status(backup_dir,'node',page_id_a2,'ERROR')
1971+
self.change_backup_status(backup_dir,'node',backup_id_a,'ERROR')
19691972

19701973
# PAGEa2 ERROR
19711974
# PAGEb1 OK
19721975
# PAGEa1 OK
19731976
# FULLb OK
1974-
# FULLaOK
1977+
# FULLaERROR
19751978

19761979
page_id_b2=self.backup_node(
19771980
backup_dir,'node',node,backup_type='page')
@@ -1981,17 +1984,21 @@ def test_merge_multiple_descendants(self):
19811984
# PAGEb1 OK
19821985
# PAGEa1 OK
19831986
# FULLb OK
1984-
# FULLaOK
1987+
# FULLaERROR
19851988

1986-
# Change PAGEb2 andPAGEb1 status to ERROR
1989+
# Change PAGEb2,PAGEb1and FULLb to ERROR
19871990
self.change_backup_status(backup_dir,'node',page_id_b2,'ERROR')
19881991
self.change_backup_status(backup_dir,'node',page_id_b1,'ERROR')
1992+
self.change_backup_status(backup_dir,'node',backup_id_b,'ERROR')
1993+
1994+
# Change FULLa to OK
1995+
self.change_backup_status(backup_dir,'node',backup_id_a,'OK')
19891996

19901997
# PAGEb2 ERROR
19911998
# PAGEa2 ERROR
19921999
# PAGEb1 ERROR
19932000
# PAGEa1 OK
1994-
# FULLbOK
2001+
# FULLbERROR
19952002
# FULLa OK
19962003

19972004
page_id_a3=self.backup_node(
@@ -2002,14 +2009,16 @@ def test_merge_multiple_descendants(self):
20022009
# PAGEa2 ERROR
20032010
# PAGEb1 ERROR
20042011
# PAGEa1 OK
2005-
# FULLbOK
2012+
# FULLbERROR
20062013
# FULLa OK
20072014

2008-
# Change PAGEa3status to ERROR
2015+
# Change PAGEa3and FULLa to ERROR
20092016
self.change_backup_status(backup_dir,'node',page_id_a3,'ERROR')
20102017

2011-
# Change PAGEb2 status to OK
2018+
# Change PAGEb2, PAGEb1 and FULLb to OK
20122019
self.change_backup_status(backup_dir,'node',page_id_b2,'OK')
2020+
self.change_backup_status(backup_dir,'node',page_id_b1,'OK')
2021+
self.change_backup_status(backup_dir,'node',backup_id_a,'OK')
20132022

20142023
page_id_b3=self.backup_node(
20152024
backup_dir,'node',node,backup_type='page')
@@ -2018,15 +2027,15 @@ def test_merge_multiple_descendants(self):
20182027
# PAGEa3 ERROR
20192028
# PAGEb2 OK
20202029
# PAGEa2 ERROR
2021-
# PAGEb1ERROR
2030+
# PAGEb1OK
20222031
# PAGEa1 OK
20232032
# FULLb OK
2024-
# FULLaOK
2033+
# FULLaERROR
20252034

2026-
# Change PAGEa3, PAGEa2 andPAGEb1 status to OK
2035+
# Change PAGEa3, PAGEa2 andFULLa status to OK
20272036
self.change_backup_status(backup_dir,'node',page_id_a3,'OK')
20282037
self.change_backup_status(backup_dir,'node',page_id_a2,'OK')
2029-
self.change_backup_status(backup_dir,'node',page_id_b1,'OK')
2038+
self.change_backup_status(backup_dir,'node',backup_id_a,'OK')
20302039

20312040
# PAGEb3 OK
20322041
# PAGEa3 OK

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp