Merge branch 'seleniumfix' into 'master'

Selenium fix ✅

Better logging, hierarchy, stability fixes
Corrected time handling

See merge request !313

circle/acl/tests/models.py

@@ -15,4 +15,8 @@
 # You should have received a copy of the GNU General Public License along
 # You should have received a copy of the GNU General Public License along
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from .test_acl import TestModel, Test2Model  # noqa
+from django.conf import settings
+
+# https://code.djangoproject.com/ticket/7835
+if settings.SETTINGS_MODULE == 'circle.settings.test':
+    from .test_acl import TestModel, Test2Model  # noqa

circle/circle/settings/selenium_test.py

@@ -40,7 +40,8 @@ INSTALLED_APPS += (
 )
 )
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
 
-path_to_selenium_test = os.path.expanduser('~/circle/circle/dashboard/tests/selenium')
+
+path_to_selenium_test = os.path.join(SITE_ROOT, "dashboard/tests/selenium")
 NOSE_ARGS = ['--stop', '--with-doctest', '--with-selenium-driver', '--selenium-driver=firefox', '-w%s' % path_to_selenium_test]
 NOSE_ARGS = ['--stop', '--with-doctest', '--with-selenium-driver', '--selenium-driver=firefox', '-w%s' % path_to_selenium_test]
 
 
 PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']
 PASSWORD_HASHERS = ['django.contrib.auth.hashers.MD5PasswordHasher']

circle/dashboard/templates/dashboard/instanceactivity_detail.html

@@ -54,7 +54,7 @@
 
 
 
 
             <dt>{% trans "result" %}</dt>
             <dt>{% trans "result" %}</dt>
-            <dd><textarea class="form-control">{{object.result|get_text:user}}</textarea></dd>
+            <dd><textarea class="form-control" id="activity_result_text">{{object.result|get_text:user}}</textarea></dd>
 
 
             <dt>{% trans "resultant state" %}</dt>
             <dt>{% trans "resultant state" %}</dt>
             <dd>{{object.resultant_state|default:'n/a'}}</dd>
             <dd>{{object.resultant_state|default:'n/a'}}</dd>

circle/dashboard/templates/dashboard/vm-detail/_activity-timeline.html

@@ -5,7 +5,7 @@
 
 
 {% for a in activities %}
 {% for a in activities %}
 <div class="activity{% if a.pk == active.pk %} activity-active{%endif%}"
 <div class="activity{% if a.pk == active.pk %} activity-active{%endif%}"
-  data-activity-id="{{ a.pk }}" data-activity-code="{{ a.activity_code }}">
+  data-activity-id="{{ a.pk }}" data-activity-code="{{ a.activity_code }}" data-timestamp="{{ a.started|date:"U" }}">
   <span class="timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}">
   <span class="timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}">
   <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-{{a.icon}}{% endif %}"></i>
   <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-{{a.icon}}{% endif %}"></i>
 </span>
 </span>

circle/dashboard/tests/selenium/config.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright 2014 Budapest University of Technology and Economics (BME IK)
+#
+# This file is part of CIRCLE Cloud.
+#
+# CIRCLE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option)
+# any later version.
+#
+# CIRCLE is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along
+# with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
+import random
+
+
+class SeleniumConfig(object):
+    # How many sec can selenium wait till certain parts of a page appears
+    wait_max_sec = 10
+    # How much sec can pass before the activity is no longer happened recently
+    recently_sec = 90
+    # Name of the logger (necessary to override test logger)
+    logger_name = "selenium"
+    # File where the log should be stored
+    log_file = "selenium.log"
+    # Log file max size in Bytes
+    log_size = 1024 * 1024 * 10
+    # Format of the log file
+    log_format = "%(asctime)s: %(name)s: %(levelname)s:  %(message)s"
+    # Backup count of the logfiles
+    log_backup = 5
+
+    # Accented letters from which selenium can choose to name stuff
+    accents = u"áéíöóúűÁÉÍÖÓÜÚŰ"
+    # Non accented letters from which selenium can choose to name stuff
+    valid_chars = "0123456789abcdefghijklmnopqrstvwxyz"
+
+    # First we choose 10 random normal letters
+    random_pass = "".join([random.choice(
+        valid_chars) for n in xrange(10)])
+    # Then we append it with 5 random accented one
+    random_pass += "".join([random.choice(
+        accents) for n in xrange(5)])
+    # Then we name our client as test_%(password)s
+    client_name = 'test_%s' % random_pass
+
+    # Which webpage should selenium use (localhost is recommended)
+    host = 'https://127.0.0.1'
+    # In default the tests create a new user then delete it afteword
+    # Disable this if selenium cannot acces the database
+    create_user = True
+
+    """
+    Note: It's possible to setup that selenium uses a distant web server
+    for testing. If you choose this method you must provide a distant superuser
+    account info for that server by overriding random_pass and client_name by
+    uncommenting the lines below.
+    """
+    # client_name = "user name here"
+    # random_pass = "password here"

circle/fabfile.py

@@ -143,8 +143,8 @@ def selenium(test=""):
             test = "--failed"
             test = "--failed"
         else:
         else:
             test += " --with-id"
             test += " --with-id"
-        run("xvfb-run ./manage.py test "
-            "--settings=circle.settings.selenium_test %s" % test)
+        run('xvfb-run --server-args="-screen 0, 1920x1080x24" ./manage.py'
+            ' test --settings=circle.settings.selenium_test %s' % test)
 
 
 
 
 def pull(dir="~/circle/circle"):
 def pull(dir="~/circle/circle"):