浏览代码

HUE-8630 [core] Fix solr_client_test reset_properties correctly.

jdesjean 7 年之前
父节点
当前提交
7cadf0d458
共有 1 个文件被更改,包括 17 次插入15 次删除
  1. 17 15
      desktop/libs/indexer/src/indexer/solr_client_tests.py

+ 17 - 15
desktop/libs/indexer/src/indexer/solr_client_tests.py

@@ -42,25 +42,27 @@ class TestSolrClient:
 
 
   def test_get_ensemble_cdh_solr(self):
-    client = SolrClient(self.user, api=MockSolrCdhCloudHdfsApi())
+    try:
+      client = SolrClient(self.user, api=MockSolrCdhCloudHdfsApi())
 
-    client._reset_properties()
-
-    assert_true(client.is_solr_cloud_mode())
-    assert_false(client.is_solr_six_or_more())
-    assert_true(client.is_solr_with_hdfs())
-    assert_equal('hue.com:2181/solr', client.get_zookeeper_host())
+      assert_true(client.is_solr_cloud_mode())
+      assert_false(client.is_solr_six_or_more())
+      assert_true(client.is_solr_with_hdfs())
+      assert_equal('hue.com:2181/solr', client.get_zookeeper_host())
+    finally:
+      client._reset_properties()
 
 
   def test_get_ensemble_upstream_solr(self):
-    client = SolrClient(self.user, api=MockSolrUpstreamCloudApi())
-
-    client._reset_properties()
-
-    assert_true(client.is_solr_cloud_mode())
-    assert_true(client.is_solr_six_or_more())
-    assert_false(client.is_solr_with_hdfs())
-    assert_equal('localhost:9983', client.get_zookeeper_host())
+    try:
+      client = SolrClient(self.user, api=MockSolrUpstreamCloudApi())
+
+      assert_true(client.is_solr_cloud_mode())
+      assert_true(client.is_solr_six_or_more())
+      assert_false(client.is_solr_with_hdfs())
+      assert_equal('localhost:9983', client.get_zookeeper_host())
+    finally:
+      client._reset_properties()