Merge lp:~didrocks/ubuntu-webcatalog/oneiric-support into lp:ubuntu-webcatalog

[Didier Roche-Tolomelli]

Support for oneiric.

Didn't make yet a more generic solution to avoir duplication between natty and oneiric as other files are subject to move as well

[Michael Nelson (michael.nelson)]

Hi didrocks!

I was away when you proposed this - sorry it took a while to get some feedback.

It's really unfortunate that you had to fiddle with symlinks to set up a dev environment - it shouldn't be the case.

AFAICS, it's only necessary because we're testing the SVG->PNG rendering and that functionality is dependent on installed libs that we can't just put in the python virtualenv. We don't *need* this functionality in a dev server necessarily.

I wonder if a better solution would be to ensure that it is only a single test that requires the library (the code that does the actual rendering is already isolated to a single method, and we can mock that method in any other test), but automatically detect if the required svg->png method is available, and if not, skip the test with a warning or provide a config option to disable the test. That would mean that the test would be run by default (ie. on our jenkins server where the libs are installed - or can be) but the test can be disabled with a local config option (skip_gtk_render_tests or whatever). I don't like conditional tests either, but I'd prefer that than the solution we've currently got (which you've had to fiddle with to get tests running on oneiric).

What do you think? I'll chat with Anthony and see what he thinks too.

[Didier Roche-Tolomelli (didrocks)]

Hey Michael,
no worry on the time taken and I'm aware that platform has this kind of issue (same with launchpad sometimes) as the dev platform isn't supported yet. :)

I think you're right about your approach, seems way better to fiddle that on the test level that with all those symlinks (/!\ my django integration understanding level is pretty low, first time I touch to it).

=== modified file 'fabtasks/bootstrap.py'
--- fabtasks/bootstrap.py	2011-07-05 16:09:31 +0000
+++ fabtasks/bootstrap.py	2011-07-05 18:07:21 +0000
@@ -59,23 +59,40 @@
                 (minor, basename))
 
     _symlink_libs([
-        '/usr/lib/pymodules/python2.%s/gtk-2.0' % minor,
         '/usr/lib/pymodules/python2.%s/cairo' % minor,
         ])
     pth_file_prenatty = '/usr/lib/pymodules/python2.%s/pygtk.pth' % minor
     pth_file_natty = '/usr/share/pyshared/pygtk.pth'
+    pth_file_preoneiric = '/usr/lib/pymodules/python2.%s/gtk-2.0' % minor
+    pth_file_oneiric = '/usr/lib/python2.%s/dist-packages/gtk-2.0' % minor
+
     if os.path.exists(pth_file_prenatty):
         _symlink_libs([
             pth_file_prenatty,
+            pth_file_preoneiric,
             '/usr/lib/pymodules/python2.%s/pygtk.py' % minor,
         ])
-    elif os.path.exists(pth_file_natty):
-        _symlink_libs([
-            pth_file_natty,
-            '/usr/lib/pymodules/python2.%s/cairo' % minor,
-            '/usr/lib/python2.%s/dist-packages/glib' % minor,
-            '/usr/lib/python2.%s/dist-packages/gobject' % minor,
-            '/usr/lib/python2.%s/dist-packages/gtk-2.0' % minor,
+    elif os.path.exists(pth_file_natty) and not os.path.exists(pth_file_oneiric):
+        _symlink_libs([
+            pth_file_natty,
+            pth_file_preoneiric,
+            '/usr/lib/pymodules/python2.%s/cairo' % minor,
+            '/usr/lib/python2.%s/dist-packages/glib' % minor,
+            '/usr/lib/python2.%s/dist-packages/gobject' % minor,
+            '/usr/lib/python2.%s/dist-packages/gtk-2.0-pysupport-compat.pth'
+                % minor,
+            '/usr/share/pyshared/pygtk.py',
+            '/usr/lib/python2.%s/dist-packages/gtk-2.0/gio' % minor,
+            '/usr/lib/python2.%s/dist-packages/gtk-2.0/LaunchpadIntegration'
+                % minor,
+        ])
+    elif os.path.exists(pth_file_oneiric):
+        _symlink_libs([
+            pth_file_natty,
+            pth_file_oneiric,
+            '/usr/lib/pymodules/python2.%s/cairo' % minor,
+            '/usr/lib/python2.%s/dist-packages/glib' % minor,
+            '/usr/lib/python2.%s/dist-packages/gobject' % minor,
             '/usr/lib/python2.%s/dist-packages/gtk-2.0-pysupport-compat.pth'
                 % minor,
             '/usr/share/pyshared/pygtk.py',