Commit 5410118

author

Ivan Lazarev

committed

[PBCKP-304] auto tests cleanup added to ptrack_helper.py

1 parent 383a1a8 commit 5410118Copy full SHA for 5410118

File tree

+17

-16

lines changed

+17

-16

lines changed

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`import shutil`
`5`	`5`
`6`	`6`	`from .helpers.cfs_helpers import find_by_extensions, find_by_name, find_by_pattern, corrupt_file`
`7`		`-from .helpers.ptrack_helpers import ProbackupTest, ProbackupException, is_test_result_ok`
	`7`	`+from .helpers.ptrack_helpers import ProbackupTest, ProbackupException`
`8`	`8`
`9`	`9`	`tblspace_name = 'cfs_tblspace'`
`10`	`10`
`@@ -1160,15 +1160,9 @@ def test_broken_file_pg_compression_into_tablespace_dir(self):`
`1160`	`1160`	`)`
`1161`	`1161`
`1162`	`1162`	`# # --- End ---#`
`1163`		`- @unittest.skipUnless(ProbackupTest.enterprise, 'skip')`
`1164`		`- def tearDown(self):`
`1165`		`- module_name = self.id().split('.')[1]`
`1166`		`- fname = self.id().split('.')[3]`
`1167`		`- if is_test_result_ok(self):`
`1168`		`- self.del_test_dir(module_name, fname)`
`1169`	`1163`
`1170`	`1164`
`1171`		`-#class CfsBackupEncTest(CfsBackupNoEncTest):`
	`1165`	`+#class CfsBackupEncTest(CfsBackupNoEncTest):`
`1172`	`1166`	`# # --- Begin --- #`
`1173`	`1167`	`# def setUp(self):`
`1174`	`1168`	`# os.environ["PG_CIPHER_KEY"] = "super_secret_cipher_key"`

Lines changed: 1 addition & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`import shutil`
`14`	`14`
`15`	`15`	`from .helpers.cfs_helpers import find_by_name`
`16`		`-from .helpers.ptrack_helpers import ProbackupTest, ProbackupException, is_test_result_ok`
	`16`	`+from .helpers.ptrack_helpers import ProbackupTest, ProbackupException`
`17`	`17`
`18`	`18`	`tblspace_name = 'cfs_tblspace'`
`19`	`19`	`tblspace_name_new = 'cfs_tblspace_new'`
`@@ -59,13 +59,6 @@ def setUp(self):`
`59`	`59`	`def add_data_in_cluster(self):`
`60`	`60`	`pass`
`61`	`61`
`62`		`- @unittest.skipUnless(ProbackupTest.enterprise, 'skip')`
`63`		`- def tearDown(self):`
`64`		`- module_name = self.id().split('.')[1]`
`65`		`- fname = self.id().split('.')[3]`
`66`		`- if is_test_result_ok(self):`
`67`		`- self.del_test_dir(module_name, fname)`
`68`		`-`
`69`	`62`
`70`	`63`	`class CfsRestoreNoencEmptyTablespaceTest(CfsRestoreBase):`
`71`	`64`	`# @unittest.expectedFailure`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,16 @@ class ProbackupTest(object):`
`201`	`201`	`# Class attributes`
`202`	`202`	`enterprise = is_enterprise()`
`203`	`203`	`enable_nls = is_nls_enabled()`
	`204`	`+ module_name = None`
	`205`	`+ fname = None`
`204`	`206`
`205`	`207`	`def __init__(self, args, *kwargs):`
`206`	`208`	`super(ProbackupTest, self).__init__(args, *kwargs)`
	`209`	`+`
	`210`	`+ if isinstance(self, unittest.TestCase):`
	`211`	`+ self.module_name = self.id().split('.')[1]`
	`212`	`+ self.fname = self.id().split('.')[3]`
	`213`	`+`
`207`	`214`	`if '-v' in argv or '--verbose' in argv:`
`208`	`215`	`self.verbose = True`
`209`	`216`	`else:`
`@@ -367,6 +374,13 @@ def __init__(self, args, *kwargs):`
`367`	`374`
`368`	`375`	`os.environ["PGAPPNAME"] = "pg_probackup"`
`369`	`376`
	`377`	`+ def tearDown(self):`
	`378`	`+ if isinstance(self, unittest.TestCase):`
	`379`	`+ module_name = self.id().split('.')[1]`
	`380`	`+ fname = self.id().split('.')[3]`
	`381`	`+ if is_test_result_ok(self):`
	`382`	`+ self.del_test_dir(module_name, fname)`
	`383`	`+`
`370`	`384`	`@property`
`371`	`385`	`def pg_config_version(self):`
`372`	`386`	`return self.version_to_num(`

Comments

(0)