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

On branch : master

commit 849470b1080b51f0e5cc617719051110e817b017 Author: Bohuslav Kabrda bkabrda@redhat.com Date: Tue Jan 15 08:14:23 2013 +0100

Fix the current tests for new way of chroots handling

coprs_frontend/tests/coprs_test_case.py | 34 ++++++++++++++++--- .../tests/test_views/test_coprs_ns/test_general.py | 4 +- 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/coprs_frontend/tests/coprs_test_case.py b/coprs_frontend/tests/coprs_test_case.py index c60cd6f..bae7b73 100644 --- a/coprs_frontend/tests/coprs_test_case.py +++ b/coprs_frontend/tests/coprs_test_case.py @@ -45,19 +45,41 @@ class CoprsTestCase(object):

@pytest.fixture def f_coprs(self): - self.c1 = models.Copr(name = 'foocopr', chroots = 'fedora-18-x86_64', owner = self.u1) - self.c2 = models.Copr(name = 'foocopr', chroots = 'fedora-17-x86_64 fedora-17-i386', owner = self.u2) - self.c3 = models.Copr(name = 'barcopr', chroots = 'fedora-rawhide-i386', owner = self.u2) + self.c1 = models.Copr(name = 'foocopr', owner = self.u1) + self.c2 = models.Copr(name = 'foocopr', owner = self.u2) + self.c3 = models.Copr(name = 'barcopr', owner = self.u2)

self.db.session.add_all([self.c1, self.c2, self.c3]) self.db.session.commit()

@pytest.fixture + def f_mock_chroots(self): + self.mc1 = models.MockChroot(os_release='fedora', os_version='18', arch='x86_64') + self.mc2 = models.MockChroot(os_release='fedora', os_version='17', arch='x86_64') + self.mc3 = models.MockChroot(os_release='fedora', os_version='17', arch='i386') + self.mc4 = models.MockChroot(os_release='fedora', os_version='rawhide', arch='i386') + + 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.m3 + self.c2.copr_chroots.append(cc2) + self.c2.copr_chroots.append(cc3) + + cc4 = models.CoprChroots() + cc4.mock_chroot = self.mc4 + self.c4.copr_chroots.append(cc4) + + @pytest.fixture def f_builds(self): - self.b1 = models.Build(copr = self.c1, user = self.u1, chroots = self.c1.chroots, submitted_on = 50, started_on = 100) + self.b1 = models.Build(copr = self.c1, user = self.u1, chroots = 'fedora-18-x86_64', submitted_on = 50, started_on = 100) self.b2 = models.Build(copr = self.c1, user = self.u2, chroots = 'fedora-17-x86_64', submitted_on = 10, ended_on = 150) - self.b3 = models.Build(copr = self.c2, user = self.u2, chroots = self.c2.chroots, submitted_on = 10) - self.b4 = models.Build(copr = self.c2, user = self.u2, chroots = self.c2.chroots, submitted_on = 100) + self.b3 = models.Build(copr = self.c2, user = self.u2, chroots = 'fedora-17-x86_64 fedora-17-i386', submitted_on = 10) + self.b4 = models.Build(copr = self.c2, user = self.u2, chroots = 'fedora-17-x86_64 fedora-17-i386', submitted_on = 100)

self.db.session.add_all([self.b1, self.b2, self.b3, self.b4]) self.db.session.commit() diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_general.py b/coprs_frontend/tests/test_views/test_coprs_ns/test_general.py index e15b105..ac87e44 100644 --- a/coprs_frontend/tests/test_views/test_coprs_ns/test_general.py +++ b/coprs_frontend/tests/test_views/test_coprs_ns/test_general.py @@ -217,7 +217,7 @@ class TestCoprUpdate(CoprsTestCase):

self.db.session.add_all([self.u1, self.c1]) r = c.post('/coprs/detail/{0}/{1}/update/'.format(self.u1.name, self.c1.name), - data = {'name': self.c1.name, 'release': self.c1.release, 'arches': self.c1.arches, 'id': self.c1.id}, + data = {'name': self.c1.name, 'fedora-18-x86_64': 'y', 'id': self.c1.id}, follow_redirects = True) assert 'Copr was updated successfully' in r.data

@@ -228,7 +228,7 @@ class TestCoprUpdate(CoprsTestCase):

self.db.session.add_all([self.u2, self.c3]) r = c.post('/coprs/detail/{0}/{1}/update/'.format(self.u2.name, self.c3.name), - data = {'name': self.c3.name, 'release': self.c3.release, 'arches': self.c3.arches, 'id': self.c3.id}, + data = {'name': self.c3.name, 'fedora-rawhide-i386': 'y', 'id': self.c3.id}, follow_redirects = True) assert 'Copr was updated successfully' in r.data