Skip to content

Commit de183b3

Browse files
Disable nton encryption if ntonencryption is not enabled
by test. Currently for each test teardown nton is disabled by default. Change-Id: I1ec8d3a0732e1e6199d39b2f202f1a9d76efbbe2 Reviewed-on: http://review.couchbase.org/124225 Reviewed-by: Balakumaran G <balakumaran.gopal@couchbase.com> Tested-by: Ritam Sharma <ritam@couchbase.com>
1 parent cda3196 commit de183b3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

pytests/basetestcase.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,8 @@ def tearDown(self):
495495
BucketOperationHelper.delete_all_buckets_or_assert(self.servers, self)
496496
ClusterOperationHelper.cleanup_cluster(self.servers, master=self.master)
497497
ClusterOperationHelper.wait_for_ns_servers_or_assert(self.servers, self)
498-
ntonencryptionBase().disable_nton_cluster(self.servers)
498+
if self.ntonencrypt == 'enable' and not self.x509enable:
499+
ntonencryptionBase().disable_nton_cluster(self.servers)
499500
self.log.info("============== basetestcase cleanup was finished for test #{0} {1} ==============" \
500501
.format(self.case_number, self._testMethodName))
501502
except BaseException:

0 commit comments

Comments
 (0)