From e6a151b65af7a08dc18c9804e18eaefe9d5d0811 Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Feb 08 2011 03:08:34 +0000
Subject: fix for TestLabController: ensure correct distro is picked


When this test is run as part of the full test suite, there will be many
distros with the same name (only install name will be unique). But we
need to make sure the right one is used in this test, otherwise it won't
be present in the lab controller we create and hence the job will
never be scheduled.

Change-Id: I396135fa61750b086e5bac82fe736ccfb486147b

---

diff --git a/Server/bkr/server/test/test_lab_controller.py b/Server/bkr/server/test/test_lab_controller.py
index e086045..002a0d4 100644
--- a/Server/bkr/server/test/test_lab_controller.py
+++ b/Server/bkr/server/test/test_lab_controller.py
@@ -24,6 +24,7 @@ class TestLabController(unittest.TestCase):
                     <recipe>
                         <distroRequires>
                             <distro_name op="=" value="%s" />
+                            <distrolabcontroller op="=" value="%s" />
                         </distroRequires>
                         <hostRequires>
                             <hostname op="=" value="%s"/>
@@ -34,7 +35,7 @@ class TestLabController(unittest.TestCase):
                     </recipe>
                 </recipeSet>
             </job>
-                 ''' % (distro, system.fqdn)))
+                 ''' % (distro.name, self.lc.fqdn, system.fqdn)))
         controller = Jobs()
         system.lab_controller = self.lc
         data_setup.create_task(name=u'/distribution/install')