Merge into trunk : remove-old-code : Code : MAAS

Status:	Merged
Approved by:	Julian Edwards on 2014-09-02
Approved revision:	no longer in the source branch.
Merged at revision:	2870
Proposed branch:	lp:~julian-edwards/maas/remove-old-code
Merge into:	lp:~maas-committers/maas/trunk
Diff against target:	116 lines (+3/-45) 2 files modified src/provisioningserver/rpc/clusterservice.py (+1/-20) src/provisioningserver/rpc/tests/test_clusterservice.py (+2/-25)
To merge this branch:	bzr merge lp:~julian-edwards/maas/remove-old-code
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)	selfie		Approve on 2014-09-02
Review via email: mp+232963@code.launchpad.net

Commit message

Remove some dead code that was not being used anywhere.

Revision history for this message

Julian Edwards (julian-edwards) on 2014-09-02:

#

review: Approve (selfie)

Revision history for this message

MAAS Lander (maas-lander) wrote on 2014-09-02:

#

Download full text (19.2 KiB)

The attempt to merge lp:~julian-edwards/maas/remove-old-code into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplejson python-simplestreams python-sphinx ...

The attempt to merge lp:~julian-edwards/maas/remove-old-code into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txamqp python-txlongpoll python-txtftp python-tz python-virtualenv python-yaml python-zope.interface rabbitmq-server syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
build-essential is already the newest version.
curl is already the newest version.
debhelper is already the newest version.
distro-info is already the newest version.
dnsutils is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
make is already the newest version.
pep8 is already the newest version.
postgresql is already the newest version.
pyflakes is already the newest version.
python-amqplib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-crochet is already the newest version.
python-curtin is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-extras is already the newest version.
python-fixtures is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-jsonschema is already the newest version.
python-lockfile is already the newest version.
python-mimeparse is already the newest version.
python-mock is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-nose is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-openssl is already the newest version.
python-paramiko is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplejson is already the newest version.
python-subunit is already the newest version.
python-tempita is already the newest version.
python-testresources is already the newest version.
python-testscenarios is already the newest version.
python-testtools is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txlongpoll is already the newest version.
python-txtftp is already the newest version.
python-tz is already the newest version.
python-yaml is already the newest version.
python-zope.interface is already the newest version.
rabbitmq-server is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
wget is already the newest version.
xvfb is already the newest version.
bzr-builddeb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-flake8 is already the newest version.
python-hivex is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
apache2 is already the newest version.
dh-apport is already the newest version.
firefox is already the newest version.
freeipmi-tools is already the newest version.
libpq-dev is already the newest version.
python-bzrlib is already the newest version.
python-django is already the newest version.
python-lxml is already the newest version.
python-pexpect is already the newest version.
python-seamicroclient is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 98 not upgraded.
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    purge python-librabbitmq
Reading package lists...
Building dependency tree...
Reading state information...
Package 'python-librabbitmq' is not installed, so not removed
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 98 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.QncLI0/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.QncLI0/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /tmp/tarmac/branch.QncLI0
New python executable in /tmp/tarmac/branch.QncLI0/bin/python2.7
Also creating executable in /tmp/tarmac/branch.QncLI0/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/python -m pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/tmp/tarmac/branch.QncLI0/parts'.
Creating directory '/tmp/tarmac/branch.QncLI0/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.QncLI0/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.QncLI0/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.QncLI0/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/tmp/tarmac/branch.QncLI0/bin/celeryd.region'.
Generated script '/tmp/tarmac/branch.QncLI0/bin/maas-region-admin'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/tmp/tarmac/branch.QncLI0/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/tmp/tarmac/branch.QncLI0/bin/maas'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/tmp/tarmac/branch.QncLI0/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/tmp/tarmac/branch.QncLI0/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/tmp/tarmac/branch.QncLI0/bin/celeryd.cluster'.
Generated script '/tmp/tarmac/branch.QncLI0/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.QncLI0/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/tmp/tarmac/branch.QncLI0/bin/test.pserv'.
bin/buildout install config-test
Installing config-test.
Generated script '/tmp/tarmac/branch.QncLI0/bin/test.config'.
bin/buildout install maas-probe-dhcp
Installing maas-probe-dhcp.
Generated script '/tmp/tarmac/branch.QncLI0/bin/maas-probe-dhcp'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/tmp/tarmac/branch.QncLI0/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.QncLI0/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.QncLI0/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
bin/buildout install maas
Updating maas.
echo bin/test.config bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --exclude=provisioningserver --exclude=maastesting --exclude=maascli --verbosity=1
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

..............................................
----------------------------------------------------------------------
Ran 46 tests in 0.578s

OK
..S.............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S...............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 3280 tests in 367.213s

OK (SKIP=2)
...............................................................................................................
----------------------------------------------------------------------
Ran 111 tests in 1.223s

OK
..............................................................S...F.....................................................................
======================================================================
FAIL: maastesting.tests.test_lint.TestLint.test_that_there_is_no_lint_in_the_tree
----------------------------------------------------------------------
_StringException: stdout/err from `make --quiet -C /tmp/tarmac/branch.QncLI0 lint`: {{{
Installing flake8.
Generated script '/tmp/tarmac/branch.QncLI0/bin/flake8'.
Generated script '/tmp/tarmac/branch.QncLI0/bin/flake8'.
src/provisioningserver/rpc/tests/test_clusterservice.py:25:1: F401 'Provides' imported but unused
src/provisioningserver/rpc/tests/test_clusterservice.py:89:1: F401 'StreamServerEndpointService' imported but unused
src/provisioningserver/rpc/tests/test_clusterservice.py:93:1: F401 'reactor' imported but unused
src/provisioningserver/rpc/tests/test_clusterservice.py:102:1: F401 'IStreamServerEndpoint' imported but unused
src/provisioningserver/rpc/tests/test_clusterservice.py:103:1: F401 'Factory' imported but unused
make[1]: *** [lint-py] Error 123
}}}

Traceback (most recent call last):
  File "/tmp/tarmac/branch.QncLI0/src/maastesting/tests/test_lint.py", line 58, in test_that_there_is_no_lint_in_the_tree
    self.execute("make", "--quiet", "-C", root, "lint")
  File "/tmp/tarmac/branch.QncLI0/src/maastesting/tests/test_lint.py", line 55, in execute
    self.assertEqual(0, process.wait(), "(return code is not zero)")
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 321, in assertEqual
    self.assertThat(observed, matcher, message)
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 406, in assertThat
    raise mismatch_error
MismatchError: 0 != 2: (return code is not zero)

----------------------------------------------------------------------
Ran 136 tests in 26.992s

FAILED (SKIP=1, failures=1)
.........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1449 tests in 17.226s

OK
make: *** [test] Error 123

Revision history for this message

MAAS Lander (maas-lander) wrote on 2014-09-02:

#

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message

MAAS Lander (maas-lander) wrote on 2014-09-02:

#

Download full text (18.9 KiB)

The attempt to merge lp:~julian-edwards/maas/remove-old-code into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplejson python-simplestreams python-sphinx ...

The attempt to merge lp:~julian-edwards/maas/remove-old-code into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Hit http://security.ubuntu.com trusty-security Release
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txamqp python-txlongpoll python-txtftp python-tz python-virtualenv python-yaml python-zope.interface rabbitmq-server syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
build-essential is already the newest version.
curl is already the newest version.
debhelper is already the newest version.
distro-info is already the newest version.
dnsutils is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
make is already the newest version.
pep8 is already the newest version.
postgresql is already the newest version.
pyflakes is already the newest version.
python-amqplib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-crochet is already the newest version.
python-curtin is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-extras is already the newest version.
python-fixtures is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-jsonschema is already the newest version.
python-lockfile is already the newest version.
python-mimeparse is already the newest version.
python-mock is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-nose is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-openssl is already the newest version.
python-paramiko is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplejson is already the newest version.
python-subunit is already the newest version.
python-tempita is already the newest version.
python-testresources is already the newest version.
python-testscenarios is already the newest version.
python-testtools is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txlongpoll is already the newest version.
python-txtftp is already the newest version.
python-tz is already the newest version.
python-yaml is already the newest version.
python-zope.interface is already the newest version.
rabbitmq-server is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
wget is already the newest version.
xvfb is already the newest version.
bzr-builddeb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-flake8 is already the newest version.
python-hivex is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
apache2 is already the newest version.
dh-apport is already the newest version.
firefox is already the newest version.
freeipmi-tools is already the newest version.
libpq-dev is already the newest version.
python-bzrlib is already the newest version.
python-django is already the newest version.
python-lxml is already the newest version.
python-pexpect is already the newest version.
python-seamicroclient is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 98 not upgraded.
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    purge python-librabbitmq
Reading package lists...
Building dependency tree...
Reading state information...
Package 'python-librabbitmq' is not installed, so not removed
The following package was automatically installed and is no longer required:
  librabbitmq1
Use 'apt-get autoremove' to remove it.
0 upgraded, 0 newly installed, 0 to remove and 98 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.t2K1UA/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.t2K1UA/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /tmp/tarmac/branch.t2K1UA
New python executable in /tmp/tarmac/branch.t2K1UA/bin/python2.7
Also creating executable in /tmp/tarmac/branch.t2K1UA/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/python -m pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/tmp/tarmac/branch.t2K1UA/parts'.
Creating directory '/tmp/tarmac/branch.t2K1UA/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.t2K1UA/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/celeryd.region'.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/maas-region-admin'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/maas'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/celeryd.cluster'.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/test.pserv'.
bin/buildout install config-test
Installing config-test.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/test.config'.
bin/buildout install maas-probe-dhcp
Installing maas-probe-dhcp.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/maas-probe-dhcp'.
bin/buildout install txlongpoll
Installing txlongpoll.
Generated script '/tmp/tarmac/branch.t2K1UA/bin/twistd.txlongpoll'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.t2K1UA/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.t2K1UA/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
bin/buildout install maas
Updating maas.
echo bin/test.config bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --exclude=provisioningserver --exclude=maastesting --exclude=maascli --verbosity=1
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

..............................................
----------------------------------------------------------------------
Ran 46 tests in 0.488s

OK
..S..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 3292 tests in 365.652s

OK (SKIP=2)
...............................................................................................................
----------------------------------------------------------------------
Ran 111 tests in 1.210s

OK
..............................................................S..F......................................................................
======================================================================
FAIL: maastesting.tests.test_lint.TestLint.test_that_imports_are_formatted
----------------------------------------------------------------------
_StringException: diff: {{{
--- /tmp/tarmac/branch.t2K1UA/src/provisioningserver/rpc/tests/test_clusterservice.py
+++ /tmp/tarmac/branch.t2K1UA/.export.pbbvNx/src/provisioningserver/rpc/tests/test_clusterservice.py
@@ -85,12 +85,8 @@
     MatchesListwise,
     MatchesStructure,
     )
-from twisted.application.internet import (
-    TimerService,
-    )
-from twisted.internet import (
-    error,
-    )
+from twisted.application.internet import TimerService
+from twisted.internet import error
 from twisted.internet.defer import (
     inlineCallbacks,
     succeed,
}}}

stdout/err from `make --quiet -C /tmp/tarmac/branch.t2K1UA/.export.pbbvNx format`: {{{src/provisioningserver/rpc/tests/test_clusterservice.py}}}

Traceback (most recent call last):
  File "/tmp/tarmac/branch.t2K1UA/src/maastesting/tests/test_lint.py", line 114, in test_that_imports_are_formatted
    "Some imports are not formatted; see the diff for the "
  File "/usr/lib/python2.7/unittest/case.py", line 412, in fail
    raise self.failureException(msg)
AssertionError: Some imports are not formatted; see the diff for the missing changes. Use `make format` to address them.

----------------------------------------------------------------------
Ran 136 tests in 27.365s

FAILED (SKIP=1, failures=1)
................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1456 tests in 17.275s

OK
make: *** [test] Error 123

 === modified file 'src/provisioningserver/rpc/clusterservice.py'
 --- src/provisioningserver/rpc/clusterservice.py	2014-08-26 17:23:16 +0000
 +++ src/provisioningserver/rpc/clusterservice.py	2014-09-02 09:30:41 +0000
@@ -14,7 +14,6 @@
  __metaclass__ = type
  __all__ = [
      "ClusterClientService",
--    "ClusterService",
+ ]
  import json
@@ -55,19 +54,14 @@
      change_power_state,
      get_power_state,
+     )
--from twisted.application.internet import (
--    StreamServerEndpointService,
--    TimerService,
--    )
++from twisted.application.internet import TimerService
  from twisted.internet import ssl
  from twisted.internet.defer import inlineCallbacks
  from twisted.internet.endpoints import (
      connectProtocol,
      TCP4ClientEndpoint,
--    TCP4ServerEndpoint,
+     )
  from twisted.internet.error import ConnectError
--from twisted.internet.protocol import Factory
  from twisted.protocols import amp
  from twisted.python import (
      filepath,
@@ -223,19 +217,6 @@
+         }
--class ClusterService(StreamServerEndpointService):
--    """A cluster controller RPC service.
--
--    This is a service - in the Twisted sense - that exposes the
--    ``Cluster`` protocol on the given port.
--    """
--
--    def __init__(self, reactor, port):
--        super(ClusterService, self).__init__(
--            TCP4ServerEndpoint(reactor, port),
--            Factory.forProtocol(Cluster))
--
--
  @implementer(IConnection)
  class ClusterClient(Cluster):
      """The RPC protocol supported by a cluster controller, client version.
 === modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
 --- src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-01 08:40:13 +0000
 +++ src/provisioningserver/rpc/tests/test_clusterservice.py	2014-09-02 09:30:41 +0000
@@ -27,7 +27,6 @@
      MockCalledWith,
      MockCallsMatch,
      MockNotCalled,
--    Provides,
+     )
  from maastesting.testcase import (
      MAASTestCase,
@@ -62,7 +61,6 @@
      Cluster,
      ClusterClient,
      ClusterClientService,
--    ClusterService,
+     )
  from provisioningserver.rpc.interfaces import IConnection
  from provisioningserver.rpc.osystems import gen_operating_systems
@@ -87,21 +85,13 @@
      MatchesListwise,
      MatchesStructure,
+     )
--from twisted.application.internet import (
--    StreamServerEndpointService,
--    TimerService,
--    )
--from twisted.internet import (
--    error,
--    reactor,
--    )
++from twisted.application.internet import TimerService
++from twisted.internet import error
  from twisted.internet.defer import (
      inlineCallbacks,
      succeed,
+     )
  from twisted.internet.endpoints import TCP4ClientEndpoint
--from twisted.internet.interfaces import IStreamServerEndpoint
--from twisted.internet.protocol import Factory
  from twisted.internet.task import Clock
  from twisted.protocols import amp
  from twisted.test.proto_helpers import StringTransportWithDisconnection
@@ -296,19 +286,6 @@
              JSON_POWER_TYPE_PARAMETERS, response["power_types"])
--class TestClusterService(MAASTestCase):
--
--    def test_init_sets_appropriate_instance_attributes(self):
--        # ClusterService is a convenience wrapper around
--        # StreamServerEndpointService. There's not much to demonstrate
--        # other than it has been initialised correctly.
--        service = ClusterService(reactor, 0)
--        self.assertThat(service, IsInstance(StreamServerEndpointService))
--        self.assertThat(service.endpoint, Provides(IStreamServerEndpoint))
--        self.assertThat(service.factory, IsInstance(Factory))
--        self.assertThat(service.factory.protocol, Equals(Cluster))
--
--
  class TestClusterClientService(MAASTestCase):
      run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)

MAAS

Merge lp:~julian-edwards/maas/remove-old-code into lp:~maas-committers/maas/trunk

Commit message

Description of the change

Preview Diff

Subscribers