Merge lp:~markgius/horizon/lp788413 into lp:~hudson-openstack/horizon/trunk

[Mark Gius]

Add two lines to testsettings that were missed during refactor.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~markgius/openstack-dashboard/lp788413 into lp:openstack-dashboard failed. Below is the output from the failed tests.

Downloading http://pypi.python.org/packages/2.6/s/setuptools/setuptools-0.6c11-py2.6.egg
Downloading/unpacking boto==1.9b (from -r /tmp/tmpTrBvYp/openstack-dashboard/tools/pip-requires (line 1))
  Cannot fetch index base URL http://pypi.python.org/simple/
  Could not find any downloads that satisfy the requirement boto==1.9b (from -r /tmp/tmpTrBvYp/openstack-dashboard/tools/pip-requires (line 1))
No distributions at all found for boto==1.9b (from -r /tmp/tmpTrBvYp/openstack-dashboard/tools/pip-requires (line 1))
Storing complete log in /var/lib/jenkins/.pip/pip.log
checking dependencies...
dependency check done.
Creating venv... done.
Installing pip in virtualenv... done.
Installing dependencies with pip (this can take a while)...

Traceback (most recent call last):
  File "bootstrap.py", line 172, in <module>
    ez['use_setuptools'](**setup_args)
  File "<string>", line 103, in use_setuptools
  File "<string>", line 97, in do_download
  File "<string>", line 158, in download_setuptools
  File "/usr/lib/python2.6/urllib2.py", line 126, in urlopen
    return _opener.open(url, data, timeout)
  File "/usr/lib/python2.6/urllib2.py", line 391, in open
    response = self._open(req, data)
  File "/usr/lib/python2.6/urllib2.py", line 409, in _open
    '_open', req)
  File "/usr/lib/python2.6/urllib2.py", line 369, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.6/urllib2.py", line 1170, in http_open
    return self.do_open(httplib.HTTPConnection, req)
  File "/usr/lib/python2.6/urllib2.py", line 1145, in do_open
    raise URLError(err)
urllib2.URLError: <urlopen error [Errno 101] Network is unreachable>
run_tests.sh: line 5: bin/buildout: No such file or directory
run_tests.sh: line 6: bin/test: No such file or directory
Command "/tmp/tmpTrBvYp/openstack-dashboard/tools/with_venv.sh pip install -E /tmp/tmpTrBvYp/openstack-dashboard/.dashboard-venv -r /tmp/tmpTrBvYp/openstack-dashboard/tools/pip-requires" failed.
None
Traceback (most recent call last):
  File "dashboard/manage.py", line 2, in <module>
    from django.core.management import execute_manager
ImportError: No module named django.core.management

[Mark Gius (markgius)]

The latest jenkins failure for this merge ends with:

"bzrlib.errors.BzrError: The message or message_callback keyword parameter is required for commit()."

I wonder if having a blank commit message is causing a problem with the tarmac plugin/integration/whatever.

=== modified file 'django-openstack/src/django_openstack/testsettings.py'
--- django-openstack/src/django_openstack/testsettings.py	2011-05-16 19:57:48 +0000
+++ django-openstack/src/django_openstack/testsettings.py	2011-05-26 00:52:27 +0000
@@ -9,6 +9,7 @@
                   'django.contrib.contenttypes',
                   'django.contrib.sessions',
                   'django_openstack',
+                  'django_openstack.templatetags',
                   'django_openstack.nova']
 ROOT_URLCONF = 'django_openstack.testurls'
 TEMPLATE_DIRS = (
@@ -16,6 +17,7 @@
 )
 SITE_BRANDING = 'OpenStack'
 SITE_NAME = 'openstack'
+ENABLE_VNC = True
 NOVA_DEFAULT_ENDPOINT = 'none'
 NOVA_DEFAULT_REGION = 'test'
 NOVA_ACCESS_KEY = 'test'