Merge lp:~ce-infrastructure/offspring/fix-offspring-dec2011-regressions into lp:offspring

[Cody A.W. Somerville]

This branch fixes a number of regressions that were introduced in late 2011 - how configuration in Offspring was changed but not all consumers of the API were updated and some functions that are console_entry shell scripts (setup tools thing) were moved but setup.py was not updated.

This branch also adds a (simple) test for the link_results templatetag which is responsible for generating the link to build results for the web front-end.

[Timothy R. Chavez (timrchavez)]

Ok...

All web tests passed, ensure the patch covered all places needing to be replaced,

grep "config.web" -R * | wc -l
3
tim@burrito:~/offspring-regressions$ !564
grep "config.publisher" -R * | wc -l
9
tim@burrito:~/offspring-regressions$ !567
grep "config.web" -R * | wc -l
3
tim@burrito:~/offspring-regressions$ bzr merge lp:~ce-infrastructure/offspring/fix-offspring-dec2011-regressions
+N lib/offspring/web/queuemanager/tests/test_templatetags.py
 M lib/offspring/master/scripts/publish_pending_releases.py
 M lib/offspring/master/scripts/sync_launchpad_project_milestones.py
 M lib/offspring/web/queuemanager/templatetags/lexbuilder_helpers.py
 M setup.py
All changes applied successfully.
tim@burrito:~/offspring-regressions$ grep "config.web" -R * | wc -l
0
tim@burrito:~/offspring-regressions$ grep "config.publisher" -R * | wc -l
0
tim@burrito:~/offspring-regressions$ grep "config.web" -R * | wc -l
0

I also ran sync_launchpad_project_milestones.run() from the Django shell without issue.

review: Approve

=== modified file 'lib/offspring/master/scripts/publish_pending_releases.py'
--- lib/offspring/master/scripts/publish_pending_releases.py	2011-06-16 20:21:28 +0000
+++ lib/offspring/master/scripts/publish_pending_releases.py	2012-04-19 19:48:22 +0000
@@ -25,9 +25,11 @@
     Store
 )
 
-from offspring import config
+from offspring.config import get_configuration
 from offspring.master.models import Release
 
+config = get_configuration()
+
 def publish_tree(src, dst):
     names = os.listdir(src)
     try:
@@ -44,25 +46,25 @@
                 # Do not publish development signatures.
                 continue
             elif (srcname.endswith('sums.txt') and 
-                    os.path.exists(config.publisher("signer_script"))):
+                    os.path.exists(config.get('publisher', "signer_script"))):
                 # Copy file into signer files directory.
                 shutil.copyfile(
                     srcname, 
-                    os.path.join(config.publisher("signer_files"), name))
+                    os.path.join(config.get('publisher', "signer_files"), name))
                 # Execute the signer script to have files signed.
-                os.system(config.publisher("signer_script"))
+                os.system(config.get('publisher', "signer_script"))
                 # Remove the file we copied into the signer directory.
                 os.remove(
-                    os.path.join(config.publisher("signer_files"), name))
+                    os.path.join(config.get('publisher', "signer_files"), name))
                 # Move the signed file to the destination.
                 shutil.move(
                     os.path.join(
-                        config.publisher("signer_results"), "%s.asc" % name
+                        config.get('publisher', "signer_results"), "%s.asc" % name
                     ), "%s.asc" % dstname)
             shutil.copyfile(srcname, dstname)
 
 def run():
-    database = create_database(config.publisher("db"))
+    database = create_database(config.get('publisher', "db"))
     store = Store(database)
     for release in store.find(Release,
                               Release.status == Release.STATUS_PENDING):
@@ -71,11 +73,11 @@
             (release.name, release.build.project))
         sys.stdout.flush()
         images_directory = "%s/images" % release.build.result_directory(
-            base_dir=config.publisher('development_pool'))
+            base_dir=config.get('publisher', 'development_pool'))
         project_directory = "%s/project" % release.build.result_directory(
-            base_dir=config.publisher('development_pool'))
+            base_dir=config.get('publisher', 'development_pool'))
         release_directory = release.result_directory(
-            base_dir=config.publisher('production_pool'))
+            base_dir=config.get('publisher', 'production_pool'))
         # images
         if os.path.exists(images_directory):
             try:
 
=== modified file 'lib/offspring/master/scripts/sync_launchpad_project_milestones.py'
--- lib/offspring/master/scripts/sync_launchpad_project_milestones.py	2010-11-30 18:55:17 +0000
+++ lib/offspring/master/scripts/sync_launchpad_project_milestones.py	2012-04-19 19:48:22 +0000
@@ -10,7 +10,7 @@
 from launchpadlib.uris import LPNET_SERVICE_ROOT
 from storm.locals import create_database, Store
 
-from offspring import config
+from offspring.config import get_configuration
 from offspring.master.models import (
     LaunchpadProject, 
     LaunchpadProjectMilestone, 
@@ -19,19 +19,20 @@
 
 def run():
     # Setup connection to launchpad
+    config = get_configuration()
     cachedir = os.path.expanduser("~/.launchpadlib/cache/")
     credentials = Credentials()
     try:
-        credentials.load(open(config.master("launchpad_oauth")))
+        credentials.load(open(config.get("master", "launchpad_oauth")))
         launchpad = Launchpad(credentials, LPNET_SERVICE_ROOT)
     except:
         launchpad = Launchpad.get_token_and_login(
             'Offspring Image Build System', LPNET_SERVICE_ROOT, cachedir)
         launchpad.credentials.save(
-            file(config.master("launchpad_oauth"), "w"))
+            file(config.get("master", "launchpad_oauth"), "w"))
 
     # Setup connection to database
-    database = create_database(config.master("db"))
+    database = create_database(config.get("master", "db"))
     store = Store(database)
 
     for launchpad_project in store.find(LaunchpadProject):
 
=== modified file 'lib/offspring/web/queuemanager/templatetags/lexbuilder_helpers.py'
--- lib/offspring/web/queuemanager/templatetags/lexbuilder_helpers.py	2010-11-29 08:27:24 +0000
+++ lib/offspring/web/queuemanager/templatetags/lexbuilder_helpers.py	2012-04-19 19:48:22 +0000
@@ -6,10 +6,11 @@
 from django import template
 from django.template.defaultfilters import stringfilter
 
-from offspring import config
+from offspring.config import get_configuration
 from offspring.web.queuemanager.models import Project
 from offspring.slave import LexbuilderSlave
 
+config = get_configuration()
 register = template.Library()
 
 @register.filter
@@ -17,7 +18,7 @@
 def generate_devel_sourceslist(projectName):
     try:
         project = Project.objects.get(name=projectName)
-        projectArchiveURI = config.web("archive_uri")
+        projectArchiveURI = config.get("web", "archive_uri")
     except:
         return ""
 
@@ -44,7 +45,7 @@
 @stringfilter
 def link_results(projectName, buildName=None):
     try:
-        base_uri = config.web("build_results_uri")
+        base_uri = config.get("web", "build_results_uri")
     except:
         return ""
 
@@ -52,7 +53,7 @@
         try:
             date, buildCount = buildName.rsplit("-", 1)
         except:
-            return config.web("build_results_uri")
+            return config.get("web", "build_results_uri")
         return "%s/%s/%s/%s" % (base_uri, projectName, date, buildCount)
     else:
         return "%s/%s" % (base_uri, projectName)
 
=== added file 'lib/offspring/web/queuemanager/tests/test_templatetags.py'
--- lib/offspring/web/queuemanager/tests/test_templatetags.py	1970-01-01 00:00:00 +0000
+++ lib/offspring/web/queuemanager/tests/test_templatetags.py	2012-04-19 19:48:22 +0000
@@ -0,0 +1,26 @@
+# Copyright 2012 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+from django.test import TestCase
+
+from offspring.config import get_configuration
+from offspring.web.queuemanager.templatetags.lexbuilder_helpers import (
+    link_results,
+)
+
+config = get_configuration()
+
+class LexbuilderHelpersTemplateTagTests(TestCase):
+
+    def test_link_results(self):
+        base_uri = config.get("web", "build_results_uri")
+        project_name = "foobar"
+        build_date = "201202"
+        build_id = "0"
+        expected_link = "%s/%s/%s/%s" % (
+            base_uri, project_name, build_date, build_id)
+        self.assertEqual(
+            link_results(project_name, "%s-%s" % (build_date, build_id)),
+            expected_link)
+
+
 
=== modified file 'setup.py'
--- setup.py	2011-11-11 01:13:02 +0000
+++ setup.py	2012-04-19 19:48:22 +0000
@@ -16,8 +16,8 @@
     ],
     entry_points = {
         'console_scripts': [
-            '../scripts/cron/build-active-projects = offspring.master:build_active_projects',
-            '../scripts/cron/process-pending-build-orders = offspring.master:process_pending_build_orders',
+            '../scripts/cron/build-active-projects = offspring.master.utils:build_active_projects',
+            '../scripts/cron/process-pending-build-orders = offspring.master.utils:process_pending_build_orders',
             '../scripts/cron/publish-pending-releases = offspring.master.scripts.publish_pending_releases:run',
             '../scripts/cron/sync-launchpad-project-milestones = offspring.master.scripts.sync_launchpad_project_milestones:run',
             '../scripts/offspring-builder-config = offspring.config:print_builder_config',