|
@@ -24,9 +24,10 @@ from nose.tools import assert_equal, assert_true
|
|
|
from django.contrib.auth.models import User
|
|
from django.contrib.auth.models import User
|
|
|
from django.urls import reverse
|
|
from django.urls import reverse
|
|
|
|
|
|
|
|
-from hadoop.pseudo_hdfs4 import is_live_cluster
|
|
|
|
|
|
|
+from dashboard.models import Collection2
|
|
|
from desktop.lib.django_test_util import make_logged_in_client
|
|
from desktop.lib.django_test_util import make_logged_in_client
|
|
|
from desktop.lib.test_utils import add_to_group, grant_access
|
|
from desktop.lib.test_utils import add_to_group, grant_access
|
|
|
|
|
+from hadoop.pseudo_hdfs4 import is_live_cluster
|
|
|
|
|
|
|
|
from libsolr.api import SolrApi
|
|
from libsolr.api import SolrApi
|
|
|
|
|
|
|
@@ -37,7 +38,6 @@ LOG = logging.getLogger(__name__)
|
|
|
try:
|
|
try:
|
|
|
# App can be blacklisted
|
|
# App can be blacklisted
|
|
|
from search.conf import SOLR_URL
|
|
from search.conf import SOLR_URL
|
|
|
- from search.models import Collection2
|
|
|
|
|
search_enabled = True
|
|
search_enabled = True
|
|
|
except:
|
|
except:
|
|
|
search_enabled = False
|
|
search_enabled = False
|
|
@@ -45,6 +45,7 @@ except:
|
|
|
|
|
|
|
|
|
|
|
|
|
class TestLibSolrWithSolr:
|
|
class TestLibSolrWithSolr:
|
|
|
|
|
+ integration = True
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
|
def setup_class(cls):
|
|
def setup_class(cls):
|