Merge lp:~vila/uci-engine/britney-config-fallout into lp:uci-engine

[Vincent Ladeuil]

Fix fallout from an old refactoring moving the config part out of britney/post_request.py.

Last spin-off from nova-failure: this fixes a fallout missed in an old britney-related refactoring.

The root cause is that we don't run the tests against different deployments in tarmac which is a known issue but shouldn't block that fix either.

[Paul Larson (pwlars)]

looks straightforward enough, I see those things moved. +1

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~vila/uci-engine/britney-config-fallout into lp:uci-engine failed. Below is the output from the failed tests.

2015-01-08 17:31:52 INFO juju.cmd supercommand.go:37 running jujud [1.20.14.1-precise-amd64 gc]
2015-01-08 17:31:52 DEBUG juju.agent agent.go:377 read agent config, format "1.18"
2015-01-08 17:31:52 INFO juju.jujud unit.go:78 unit agent unit-ci-airline-ts-django-0 start (1.20.14.1-precise-amd64 [gc])
2015-01-08 17:31:52 INFO juju.worker runner.go:260 start "api"
2015-01-08 17:31:52 INFO juju.state.api apiclient.go:242 dialing "wss://10.0.3.1:17070/"
2015-01-08 17:31:52 INFO juju.state.api apiclient.go:176 connection established to "wss://10.0.3.1:17070/"
2015-01-08 17:31:52 INFO juju.state.api apiclient.go:242 dialing "wss://10.0.3.1:17070/"
2015-01-08 17:31:52 INFO juju.state.api apiclient.go:176 connection established to "wss://10.0.3.1:17070/"
2015-01-08 17:31:52 INFO juju.state.api apiclient.go:242 dialing "wss://10.0.3.1:17070/"
2015-01-08 17:31:52 INFO juju.state.api apiclient.go:176 connection established to "wss://10.0.3.1:17070/"
2015-01-08 17:31:53 INFO juju.worker runner.go:260 start "upgrader"
2015-01-08 17:31:53 INFO juju.worker runner.go:260 start "logger"
2015-01-08 17:31:53 DEBUG juju.worker.logger logger.go:35 initial log config: "<root>=DEBUG"
2015-01-08 17:31:53 INFO juju.worker runner.go:260 start "uniter"
2015-01-08 17:31:53 DEBUG juju.worker.logger logger.go:60 logger setup
2015-01-08 17:31:53 INFO juju.worker runner.go:260 start "apiaddressupdater"
2015-01-08 17:31:53 INFO juju.worker runner.go:260 start "rsyslog"
2015-01-08 17:31:53 DEBUG juju.worker.rsyslog worker.go:75 starting rsyslog worker mode 1 for "unit-ci-airline-ts-django-0" "tarmac-local"
2015-01-08 17:31:53 DEBUG juju.worker.logger logger.go:45 reconfiguring logging from "<root>=DEBUG" to "<root>=WARNING;unit=DEBUG"
2015-01-08 17:32:12 INFO juju-log Making dir /srv/ci-airline-ts-django/code/ root:root 555
2015-01-08 17:32:12 INFO juju-log Adding dependencies.
2015-01-08 17:32:12 INFO juju-log installing apt packages...
2015-01-08 17:32:15 INFO config-changed gpg: keyring `/tmp/tmpBBCrhv/secring.gpg' created
2015-01-08 17:32:15 INFO config-changed gpg: keyring `/tmp/tmpBBCrhv/pubring.gpg' created
2015-01-08 17:32:15 INFO config-changed gpg: requesting key 6A8DFC40 from hkp server keyserver.ubuntu.com
2015-01-08 17:32:15 INFO config-changed gpg: /tmp/tmpBBCrhv/trustdb.gpg: trustdb created
2015-01-08 17:32:15 INFO config-changed gpg: key 6A8DFC40: public key "Launchpad PPA for Canonical CI Engineering" imported
2015-01-08 17:32:15 INFO config-changed gpg: Total number processed: 1
2015-01-08 17:32:15 INFO config-changed gpg: imported: 1 (RSA: 1)
2015-01-08 17:32:16 INFO config-changed OK
2015-01-08 17:32:23 INFO config-changed Hit http://archive.ubuntu.com precise Release.gpg
2015-01-08 17:32:23 INFO config-changed Get:1 http://ppa.launchpad.net precise Release.gpg [316 B]
2015-01-08 17:32:24 INFO config-changed Get:2 http://ubuntu-cloud.archive.canonical.com precise-updates/cloud-tools Release.gpg [543 B]
2015-01-08 17:32:24 INFO config-changed Get:3 http://ppa.launchpad.net prec...

=== modified file 'tests/test_britney.py'
--- tests/test_britney.py	2014-11-03 12:59:48 +0000
+++ tests/test_britney.py	2015-01-08 10:52:07 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # Ubuntu Continuous Integration Engine
-# Copyright 2014 Canonical Ltd.
+# Copyright 2014, 2015 Canonical Ltd.
 
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License version 3, as
@@ -37,6 +37,7 @@
 
 
 from britney import (
+    config,
     post_request,
     process_results,
 )
@@ -186,15 +187,15 @@
         password = 's3cr3t'
         rabbit_ip = get_rabbit_ip(status)
         deployers.expose_rabbit(self, rabbit_ip, user, password)
-        os.makedirs(post_request.user_config_dir())
-        self.config = post_request.BritneyStack()
+        os.makedirs(config.user_config_dir())
+        self.config = config.BritneyStack()
         self.config.store._load_from_string('''\
 uci.rabbit.host = {rabbit_ip}
 uci.rabbit.user = {user}
 uci.rabbit.password = {password}
         '''.format(**locals()))
         fixtures.patch(self, amqp_utils, 'get_config',
-                       post_request.amqp_config(self.config))
+                       config.amqp_config(self.config))
         self.out = StringIO()
         self.err = StringIO()