Browse Source

[libsolr] Fix live cluster test

Erick Tryzelaar 10 năm trước cách đây
mục cha
commit
0051d9b

+ 5 - 2
desktop/core/ext-py/django-nose-1.3/django_nose/runner.py

@@ -245,8 +245,11 @@ def _foreign_key_ignoring_handle(self, *fixture_labels, **options):
         cursor = connection.cursor()
         cursor.execute('SET foreign_key_checks = 1')
 
-        if commit:
-            connection.close()
+        # NOTE(erickt): This breaks installing Hue examples because we use
+        # loaddata to install the examples, then run Document.objects.sync() to
+        # clean up the database, so we need our connection to be left open.
+        #if commit:
+        #    connection.close()
 
 
 def _skip_create_test_db(self, verbosity=1, autoclobber=False, serialize=True):

+ 3 - 1
desktop/libs/libsolr/src/libsolr/tests.py

@@ -77,6 +77,8 @@ class TestLibSolrWithSolr:
 
   def test_query(self):
     collection = Collection2(user=self.user, name='log_analytics_demo')
+    collection = json.loads(collection.get_json(self.user))
+
     query = {'qs': [{'q': ''}], 'fqs': [], 'start': 0}
 
-    SolrApi(SOLR_URL.get(), self.user).query(collection, query)
+    SolrApi(SOLR_URL.get(), self.user).query(collection['collection'], query)