|
|
@@ -52,7 +52,6 @@ import desktop.redaction as redaction
|
|
|
import desktop.views as views
|
|
|
|
|
|
from desktop.appmanager import DESKTOP_APPS
|
|
|
-from desktop.lib import django_mako
|
|
|
from desktop.lib.django_test_util import make_logged_in_client
|
|
|
from desktop.lib.conf import validate_path
|
|
|
from desktop.lib.django_util import TruncatingModel
|
|
|
@@ -60,14 +59,14 @@ from desktop.lib.exceptions_renderable import PopupException
|
|
|
from desktop.lib.conf import _configs_from_dir
|
|
|
from desktop.lib.paths import get_desktop_root
|
|
|
from desktop.lib.test_utils import grant_access
|
|
|
-from desktop.models import Directory, Document, Document2, get_data_link, _version_from_properties, HUE_VERSION,\
|
|
|
- ClusterConfig
|
|
|
+from desktop.models import Directory, Document, Document2, get_data_link, _version_from_properties, ClusterConfig
|
|
|
from desktop.redaction import logfilter
|
|
|
from desktop.redaction.engine import RedactionPolicy, RedactionRule
|
|
|
from desktop.views import check_config, home, generate_configspec, load_confs, collect_validation_messages
|
|
|
from desktop.auth.backend import rewrite_user
|
|
|
from dashboard.conf import HAS_SQL_ENABLED
|
|
|
|
|
|
+
|
|
|
def test_home():
|
|
|
c = make_logged_in_client(username="test_home", groupname="test_home", recreate=True, is_superuser=False)
|
|
|
user = User.objects.get(username="test_home")
|
|
|
@@ -246,15 +245,16 @@ def hue_version():
|
|
|
HUE_VERSION_BAK = HUE_VERSION
|
|
|
|
|
|
try:
|
|
|
- assert_equal('3.9.0-cdh5.9.0-SNAPSHOT', _version_from_properties(StringIO.StringIO("""# Autogenerated build properties
|
|
|
+ assert_equal('cdh6.x-SNAPSHOT', _version_from_properties(StringIO.StringIO("""# Autogenerated build properties
|
|
|
version=3.9.0-cdh5.9.0-SNAPSHOT
|
|
|
git.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8
|
|
|
+cloudera.cdh.release=cdh6.x-SNAPSHOT
|
|
|
cloudera.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8aaaaa""")))
|
|
|
|
|
|
- assert_equal(HUE_DESKTOP_VERSION, _version_from_properties(StringIO.StringIO("""# Autogenerated build properties
|
|
|
+ assert_false(_version_from_properties(StringIO.StringIO("""# Autogenerated build properties
|
|
|
version=3.9.0-cdh5.9.0-SNAPSHOT git.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8 cloudera.hash=f5fbe90b6a1d0c186b0ddc6e65ce5fc8d24725c8aaaaa""")))
|
|
|
|
|
|
- assert_equal(HUE_DESKTOP_VERSION, _version_from_properties(StringIO.StringIO('')))
|
|
|
+ assert_false(_version_from_properties(StringIO.StringIO('')))
|
|
|
finally:
|
|
|
HUE_VERSION = HUE_VERSION_BAK
|
|
|
|