Commitae19a99

committed

[Issue#79] minor fixes

1 parente58cf5b commitae19a99Copy full SHA for ae19a99

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1276,7 +1276,7 @@ get_dbOid_exclude_list(pgBackup backup, parray files,`
`1276`	`1276`
`1277`	`1277`	`/* extra sanity, we must be totally sure that list is not empty */`
`1278`	`1278`	`if (!dbOid_exclude_list\|\|parray_num(dbOid_exclude_list)<1)`
`1279`		`-elog(ERROR,"Failed to find a matchfor partial restorein database_map of backup %s",`
	`1279`	`+elog(ERROR,"Failed to find a match in database_map of backup %s for partial restore",`
`1280`	`1280`	`base36enc(backup->start_time));`
`1281`	`1281`
`1282`	`1282`	`/* sort dbOid array in ASC order */`
`@@ -1293,4 +1293,4 @@ pgCompareOid(const void f1, const void f2)`
`1293`	`1293`	`Oidf2p=(Oid**)f2;`
`1294`	`1294`
`1295`	`1295`	`return ((Oid)f1p-(Oid)f2p);`
`1296`		`-}`
	`1296`	`+}`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3180,6 +3180,22 @@ def test_empty_and_mangled_database_map(self):`
`3180`	`3180`	`'\n Unexpected Error Message: {0}\n CMD: {1}'.format(`
`3181`	`3181`	`repr(e.message),self.cmd))`
`3182`	`3182`
	`3183`	`+try:`
	`3184`	`+self.restore_node(`
	`3185`	`+backup_dir,'node',node_restored,`
	`3186`	`+options=["--db-exclude=db1",'--no-validate'])`
	`3187`	`+self.assertEqual(`
	`3188`	`+1,0,`
	`3189`	`+"Expecting Error because database_map is empty.\n "`
	`3190`	`+"Output: {0}\n CMD: {1}".format(`
	`3191`	`+self.output,self.cmd))`
	`3192`	`+exceptProbackupExceptionase:`
	`3193`	`+self.assertIn(`
	`3194`	`+'ERROR: field "dbOid" is not found in the line 42 of '`
	`3195`	`+'the file backup_content.control',e.message,`
	`3196`	`+'\n Unexpected Error Message: {0}\n CMD: {1}'.format(`
	`3197`	`+repr(e.message),self.cmd))`
	`3198`	`+`
`3183`	`3199`	`# check that simple restore is still possible`
`3184`	`3200`	`self.restore_node(`
`3185`	`3201`	`backup_dir,'node',node_restored,options=['--no-validate'])`

Comments

(0)