[copr] master: Only bind the testing mock_chroots to coprs if we use coprs fixture (8cb3525)

bkabrda at fedoraproject.org bkabrda at fedoraproject.org
Tue Jan 15 11:06:53 UTC 2013


Repository : http://git.fedorahosted.org/cgit/copr.git

On branch  : master

>---------------------------------------------------------------

commit 8cb3525da922781b9d0a7720299cee6775d091c0
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Tue Jan 15 11:44:44 2013 +0100

    Only bind the testing mock_chroots to coprs if we use coprs fixture


>---------------------------------------------------------------

 coprs_frontend/tests/coprs_test_case.py |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/coprs_frontend/tests/coprs_test_case.py b/coprs_frontend/tests/coprs_test_case.py
index d711c7f..c0d2838 100644
--- a/coprs_frontend/tests/coprs_test_case.py
+++ b/coprs_frontend/tests/coprs_test_case.py
@@ -59,20 +59,22 @@ class CoprsTestCase(object):
         self.mc3 = models.MockChroot(os_release='fedora', os_version='17', arch='i386', is_active=True)
         self.mc4 = models.MockChroot(os_release='fedora', os_version='rawhide', arch='i386', is_active=True)
 
-        cc1 = models.CoprChroot()
-        cc1.mock_chroot = self.mc1
-        self.c1.copr_chroots.append(cc1)
-
-        cc2 = models.CoprChroot()
-        cc2.mock_chroot = self.mc2
-        cc3 = models.CoprChroot()
-        cc3.mock_chroot = self.mc3
-        self.c2.copr_chroots.append(cc2)
-        self.c2.copr_chroots.append(cc3)
-
-        cc4 = models.CoprChroot()
-        cc4.mock_chroot = self.mc4
-        self.c3.copr_chroots.append(cc4)
+        # only bind to coprs if the test has used the f_coprs fixture
+        if hasattr(self, 'c1'):
+            cc1 = models.CoprChroot()
+            cc1.mock_chroot = self.mc1
+            self.c1.copr_chroots.append(cc1)
+
+            cc2 = models.CoprChroot()
+            cc2.mock_chroot = self.mc2
+            cc3 = models.CoprChroot()
+            cc3.mock_chroot = self.mc3
+            self.c2.copr_chroots.append(cc2)
+            self.c2.copr_chroots.append(cc3)
+
+            cc4 = models.CoprChroot()
+            cc4.mock_chroot = self.mc4
+            self.c3.copr_chroots.append(cc4)
 
         self.db.session.add_all([self.mc1, self.mc2, self.mc3, self.mc4])
         self.db.session.commit()



More information about the copr-devel mailing list