Merge lp:~edwin-grubbs/launchpad/broken_test_do_not_copy_disabled_dases into lp:launchpad/db-devel

[Edwin Grubbs]

This is a fix for this error on db-devel caused by revision 9871, which was actually revision 11682 from devel. The branch passed the tests on devel, so it must be a new test in db-devel that is using the _create_distroseries() method that was eliminated.

Error in test lp.soyuz.scripts.tests.test_initialise_distroseries.TestInitialiseDistroSeries.test_do_not_copy_disabled_dases
Traceback (most recent call last):
_StringException: Text attachment: traceback
------------
Traceback (most recent call last):
  File "/srv/buildbot/slaves/launchpad/lucid-db-devel/build/orig_sourcecode/eggs/testtools-0.9.6-py2.6.egg/testtools/runtest.py", line 144, in _run_user
    return fn(*args)
  File "/srv/buildbot/slaves/launchpad/lucid-db-devel/build/orig_sourcecode/eggs/testtools-0.9.6-py2.6.egg/testtools/testcase.py", line 465, in _run_test_method
    testMethod()
  File "/srv/buildbot/slaves/launchpad/lucid-db-devel/build/lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py", line 256, in test_do_not_copy_disabled_dases
    foobuntu = self._create_distroseries(parent)
AttributeError: 'TestInitialiseDistroSeries' object has no attribute '_create_distroseries'
------------

[Edwin Grubbs (edwin-grubbs)]

Steve Kowalik is fixing this.

Unmerged revisions

9872. By Edwin Grubbs on 2010-10-07

Fixed test.

=== modified file 'lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py'
--- lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py	2010-10-06 20:34:27 +0000
+++ lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py	2010-10-07 04:24:52 +0000
@@ -253,12 +253,12 @@
             distroseries=parent, processorfamily=ppc)
         ppc_das.enabled = False
         parent.nominatedarchindep = i386_das
-        foobuntu = self._create_distroseries(parent)
-        ids = InitialiseDistroSeries(foobuntu)
+        series = self.factory.makeDistroSeries(parent_series=parent)
+        ids = InitialiseDistroSeries(series)
         ids.check()
         ids.initialise()
         das = list(IStore(DistroArchSeries).find(
-            DistroArchSeries, distroseries = foobuntu))
+            DistroArchSeries, distroseries=series))
         self.assertEqual(len(das), 1)
         self.assertEqual(
             das[0].architecturetag, i386_das.architecturetag)