Fix validation test

Artur Zakirov · Artur Zakirov · commit 38407a0d44df · 2017-02-17T16:49:06.000+03:00
diff --git a/tests/pb_lib.py b/tests/pb_lib.py
@@ -178,7 +178,7 @@ def show_pb(self, node, id=None, options=[], as_text=False):
 				if line[0] != six.b("#")[0]
 			])
 
-	def validate_pb(self, node, id, options=[]):
+	def validate_pb(self, node, id=None, options=[]):
 		cmd_list = [
 			"-B", self.backup_dir(node),
 			"validate",
diff --git a/tests/validate_test.py b/tests/validate_test.py
@@ -2,6 +2,7 @@
 from os import path, listdir
 import six
 from .pb_lib import ProbackupTest
+from datetime import datetime, timedelta
 from testgres import stop_all
 import subprocess
 
@@ -18,9 +19,9 @@ def tearDownClass(cls):
 		except:
 			pass
 
-	def test_validate_broke_wal_1(self):
+	def test_validate_wal_1(self):
 		"""recovery to latest from full backup"""
-		node = self.make_bnode('test_validate_broke_wal_1', base_dir="tmp_dirs/validate/broke_wal_1")
+		node = self.make_bnode('test_validate_wal_1', base_dir="tmp_dirs/validate/wal_1")
 		node.start()
 		self.assertEqual(self.init_pb(node), six.b(""))
 		node.pgbench_init(scale=2)
@@ -40,6 +41,9 @@ def test_validate_broke_wal_1(self):
 		pgbench.wait()
 		pgbench.stdout.close()
 
+		# Save time to validate
+		target_time = datetime.now()
+
 		target_xid = None
 		with node.connect("postgres") as con:
 			res = con.execute("INSERT INTO tbl0005 VALUES ('inserted') RETURNING (xmin)")
@@ -49,13 +53,42 @@ def test_validate_broke_wal_1(self):
 		node.execute("postgres", "SELECT pg_switch_xlog()")
 		node.stop({"-m": "immediate"})
 
+		id_backup = self.show_pb(node)[0].id
+
+		# Validate to real time
+		self.assertIn(six.b("INFO: Backup validation stopped on"),
+			self.validate_pb(node, options=["--time='{:%Y-%m-%d %H:%M:%S}'".format(
+				target_time)]))
+
+		# Validate to unreal time
+		self.assertIn(six.b("ERROR: no full backup found, cannot validate."),
+			self.validate_pb(node, options=["--time='{:%Y-%m-%d %H:%M:%S}'".format(
+				target_time - timedelta(days=2))]))
+
+		# Validate to unreal time #2
+		self.assertIn(six.b("ERROR: there are no WAL records to time"),
+			self.validate_pb(node, options=["--time='{:%Y-%m-%d %H:%M:%S}'".format(
+				target_time + timedelta(days=2))]))
+
+		# Validate to real xid
+		self.assertIn(six.b("INFO: Backup validation stopped on"),
+			self.validate_pb(node, options=["--xid=%s" % target_xid]))
+
+		# Validate to unreal xid
+		self.assertIn(six.b("ERROR: there are no WAL records to xid"),
+			self.validate_pb(node, options=["--xid=%d" % (int(target_xid) + 1000)]))
+		
+		# Validate with backup ID
+		self.assertIn(six.b("INFO: Backup validation stopped on"),
+			self.validate_pb(node, id_backup))
+
+		# Validate broken WAL
 		wals_dir = path.join(self.backup_dir(node), "wal")
 		wals = [f for f in listdir(wals_dir) if path.isfile(path.join(wals_dir, f))]
 		wals.sort()
 		with open(path.join(wals_dir, wals[-3]), "rb+") as f:
 			f.seek(256)
 			f.write(six.b("blablabla"))
 
-		id_backup = self.show_pb(node)[0].id
 		res = self.validate_pb(node, id_backup, options=['--xid=%s' % target_xid])
-		self.assertIn(six.b("there are not WAL records to xid"), res)
+		self.assertIn(six.b("there are no WAL records to xid"), res)
