Revert "Making changes for switch between couchbase3 and couchbase2 f…

…or python 2 and 3"

This reverts commit f452f83.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I11d44209b701229a6875bf468cade70ce65572b1
Reviewed-on: http://review.couchbase.org/c/testrunner/+/132094
Tested-by: Balakumaran G <balakumaran.gopal@couchbase.com>
Reviewed-by: Balakumaran G <balakumaran.gopal@couchbase.com>

lib/testconstants.py

@@ -230,18 +230,10 @@
 CB_RELEASE_REPO = "http://{0}/builds/releases/".format(CB_DOWNLOAD_SERVER)
 #MV_RELEASE_REPO = "http://latestbuilds.hq.couchbase.com/release"
 MC_BIN_CLIENT = "mc_bin_client"
-<<<<<<< HEAD   (30f15b adding fts to rqg config file)
 TESTRUNNER_CLIENT = "testrunner_client"
 PYTHON_SDK = "python_sdk"
 CB_RELEASE_APT_GET_REPO = "http://172.23.126.166/couchbase-release/10/couchbase-release-1.0-0.deb"
 CB_RELEASE_YUM_REPO = "http://172.23.126.166/couchbase-release/10/couchbase-release-1.0-0.noarch.rpm"
-=======
-PYTHON_SDK = "python_sdk"
-# TESTRUNNER_CLIENT = "testrunner_client"
-TESTRUNNER_CLIENT = PYTHON_SDK
-CB_RELEASE_APT_GET_REPO = "http://latestbuilds.service.couchbase.com/couchbase-release/10/couchbase-release-1.0-0.deb"
-CB_RELEASE_YUM_REPO = "http://latestbuilds.service.couchbase.com/couchbase-release/10/couchbase-release-1.0-0.noarch.rpm"
->>>>>>> CHANGE (d182f6 Making changes for switch between couchbase3 and couchbase2 )
 DEWIKI = "https://s3-us-west-1.amazonaws.com/qebucket/testrunner/data/dewiki.txt.gz"
 ENWIKI = "https://s3-us-west-1.amazonaws.com/qebucket/testrunner/data/enwiki.txt.gz"
 ESWIKI = "https://s3-us-west-1.amazonaws.com/qebucket/testrunner/data/eswiki.txt.gz"

pytests/fts/fts_callable.py

@@ -46,13 +46,9 @@ def __init__(self, nodes, es_validate=False, es_reset=True):
                       "wildcard", "regexp", "query_string",
                       "numeric_range", "date_range"]
         if self.compare_es and not self.elastic_node:
-<<<<<<< HEAD   (30f15b adding fts to rqg config file)
             raise ("For ES result validation, pls add in the"
                       " [elastic] section in your ini file,"
                       " else set \"compare_es\" as False")
-=======
-            raise Exception("For ES result validation, pls add in the")
->>>>>>> CHANGE (d182f6 Making changes for switch between couchbase3 and couchbase2 )
         elif self.compare_es:
             self.es = ElasticSearchBase(self.elastic_node, self.log)
             if es_reset:

pytests/tuqquery/ttl_with_n1ql.py

@@ -1,11 +1,6 @@
 import sys
 import time
-<<<<<<< HEAD   (30f15b adding fts to rqg config file)
 from couchbase.cluster import Cluster
-=======
-
-from couchbase.cluster import Cluster, ClusterOptions
->>>>>>> CHANGE (d182f6 Making changes for switch between couchbase3 and couchbase2 )
 from couchbase.cluster import PasswordAuthenticator
 from membase.api.rest_client import RestConnection
 from remote.remote_util import RemoteMachineShellConnection
@@ -28,8 +23,9 @@ def setUp(self):
         self.default_bucket_name = self.input.param('bucket_name', 'default')
 
         self.cb_rest = RestConnection(self.master)
-        self.auth_ops = ClusterOptions(PasswordAuthenticator(self.master.rest_username, self.master.rest_password))
-        self.cb_cluster = Cluster('couchbase://{0}'.format(self.master.ip), self.auth_ops)
+        self.cb_cluster = Cluster('couchbase://{0}'.format(self.master.ip))
+        authenticator = PasswordAuthenticator(self.master.rest_username, self.master.rest_password)
+        self.cb_cluster.authenticate(authenticator)
 
     def tearDown(self):
         self.log.info("==============  QueryExpirationTests tearDown has started ==============")