[PATCH 2/2] Adjust unit-tests to the new urls

Pierre-Yves Chibon pingou at pingoured.fr
Sat Sep 14 11:09:07 UTC 2013


---
 .../test_views/test_coprs_ns/test_coprs_general.py | 80 +++++++++++-----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
index 00551dd..ca3d25f 100644
--- a/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
+++ b/coprs_frontend/tests/test_views/test_coprs_ns/test_coprs_general.py
@@ -19,13 +19,13 @@ class TestCoprsOwned(CoprsTestCase):
     @TransactionDecorator('u3')
     def test_owned_none(self, f_users, f_coprs, f_db):
         self.db.session.add(self.u3)
-        r = self.test_client.get('/coprs/owned/{0}/'.format(self.u3.name))
+        r = self.test_client.get('/coprs/{0}/'.format(self.u3.name))
         assert 'No coprs...' in r.data
 
     @TransactionDecorator('u1')
     def test_owned_one(self, f_users, f_coprs, f_db):
         self.db.session.add(self.u1)
-        r = self.test_client.get('/coprs/owned/{0}/'.format(self.u1.name))
+        r = self.test_client.get('/coprs/{0}/'.format(self.u1.name))
         assert r.data.count('<div class="copr">') == 1
 
 class TestCoprsAllowed(CoprsTestCase):
@@ -33,19 +33,19 @@ class TestCoprsAllowed(CoprsTestCase):
     @TransactionDecorator('u3')
     def test_allowed_none(self, f_users, f_coprs, f_copr_permissions, f_db):
         self.db.session.add(self.u3)
-        r = self.test_client.get('/coprs/allowed/{0}/'.format(self.u3.name))
+        r = self.test_client.get('/coprs/{0}/allowed/'.format(self.u3.name))
         assert 'No coprs...' in r.data
 
     @TransactionDecorator('u2')
     def test_allowed_one(self, f_users, f_coprs, f_copr_permissions, f_db):
         self.db.session.add(self.u1)
-        r = self.test_client.get('/coprs/allowed/{0}/'.format(self.u1.name))
+        r = self.test_client.get('/coprs/{0}/allowed/'.format(self.u2.name))
         assert r.data.count('<div class="copr">') == 1
 
     @TransactionDecorator('u1')
     def test_allowed_one_but_asked_for_one_more(self, f_users, f_coprs, f_copr_permissions, f_db):
         self.db.session.add(self.u1)
-        r = self.test_client.get('/coprs/allowed/{0}/'.format(self.u1.name))
+        r = self.test_client.get('/coprs/{0}/allowed/'.format(self.u1.name))
         assert r.data.count('<div class="copr">') == 1
 
 class TestCoprNew(CoprsTestCase):
@@ -53,7 +53,7 @@ class TestCoprNew(CoprsTestCase):
 
     @TransactionDecorator('u1')
     def test_copr_new_normal(self, f_users, f_mock_chroots, f_db):
-        r = self.test_client.post('/coprs/new/', data = {'name': 'foo', 'fedora-rawhide-i386': 'y', 'arches': ['i386']}, follow_redirects = True)
+        r = self.test_client.post('/coprs/{0}/new/'.format(self.u1.name), data = {'name': 'foo', 'fedora-rawhide-i386': 'y', 'arches': ['i386']}, follow_redirects = True)
         assert self.models.Copr.query.filter(self.models.Copr.name == 'foo').first()
         assert self.success_string in r.data
 
@@ -67,7 +67,7 @@ class TestCoprNew(CoprsTestCase):
         def test_receiver(sender, **kwargs):
             signals_received.append(kwargs['copr'])
         copr_created.connect(test_receiver)
-        r = self.test_client.post('/coprs/new/', data={'name': 'foo', 'fedora-rawhide-i386': 'y', 'arches': ['i386']}, follow_redirects=True)
+        r = self.test_client.post('/coprs/{0}/new/'.format(self.u1.name)', data={'name': 'foo', 'fedora-rawhide-i386': 'y', 'arches': ['i386']}, follow_redirects=True)
         assert len(signals_received) == 1
         assert signals_received[0].name == 'foo'
 
@@ -78,7 +78,7 @@ class TestCoprNew(CoprsTestCase):
         foocoprs = len(self.models.Copr.query.filter(self.models.Copr.name == self.c1.name).all())
         assert foocoprs > 0
 
-        r = self.test_client.post('/coprs/new/', data = {'name': self.c1.name, 'fedora-rawhide-i386': 'y'}, follow_redirects = True)
+        r = self.test_client.post('/coprs/{0}/new/'.format(self.u3.name), data = {'name': self.c1.name, 'fedora-rawhide-i386': 'y'}, follow_redirects = True)
         self.db.session.add(self.c1)
         assert len(self.models.Copr.query.filter(self.models.Copr.name == self.c1.name).all()) == foocoprs + 1
         assert self.success_string in r.data
@@ -89,14 +89,14 @@ class TestCoprNew(CoprsTestCase):
         foocoprs = len(self.models.Copr.query.filter(self.models.Copr.name == self.c1.name).all())
         assert foocoprs > 0
 
-        r = self.test_client.post('/coprs/new/', data = {'name': self.c1.name, 'fedora-rawhide-i386': 'y'}, follow_redirects = True)
+        r = self.test_client.post('/coprs/{0}/new/'.format(self.u1.name), data = {'name': self.c1.name, 'fedora-rawhide-i386': 'y'}, follow_redirects = True)
         self.db.session.add(self.c1)
         assert len(self.models.Copr.query.filter(self.models.Copr.name == self.c1.name).all()) == foocoprs
         assert "You already have copr named" in r.data
 
     @TransactionDecorator('u1')
     def test_copr_new_with_initial_pkgs(self, f_users, f_mock_chroots, f_db):
-        r = self.test_client.post('/coprs/new/', data = {'name': 'foo', 'fedora-rawhide-i386': 'y', 'initial_pkgs': ['http://f', 'http://b']}, follow_redirects = True)
+        r = self.test_client.post('/coprs/{0}/new/'.format(self.u1.name), data = {'name': 'foo', 'fedora-rawhide-i386': 'y', 'initial_pkgs': ['http://f', 'http://b']}, follow_redirects = True)
         copr = self.models.Copr.query.filter(self.models.Copr.name == 'foo').first()
         assert copr
         assert self.success_string in r.data
@@ -113,7 +113,7 @@ class TestCoprNew(CoprsTestCase):
         self.db.session.commit()
 
         self.db.session.add(self.c1)
-        r = self.test_client.post('/coprs/new/', data = {'name': self.c1.name, 'fedora-rawhide-i386': 'y', 'arches': ['i386']}, follow_redirects = True)
+        r = self.test_client.post('/coprs/{0}/new/'.format(self.u1.name), data = {'name': self.c1.name, 'fedora-rawhide-i386': 'y', 'arches': ['i386']}, follow_redirects = True)
         self.db.session.add_all([self.c1, self.u1])
         assert len(self.models.Copr.query.filter(self.models.Copr.name==self.c1.name).\
                                           filter(self.models.Copr.owner==self.u1).\
@@ -123,24 +123,24 @@ class TestCoprNew(CoprsTestCase):
 
 class TestCoprDetail(CoprsTestCase):
     def test_copr_detail_not_found(self):
-        r = self.tc.get('/coprs/detail/foo/bar/')
+        r = self.tc.get('/coprs/foo/bar/')
         assert r.status_code == 404
 
     def test_copr_detail_normal(self, f_users, f_coprs, f_db):
-        r = self.tc.get('/coprs/detail/{0}/{1}/'.format(self.u1.name, self.c1.name))
+        r = self.tc.get('/coprs/{0}/{1}/'.format(self.u1.name, self.c1.name))
         assert r.status_code == 200
         assert self.c1.name in r.data
 
     def test_copr_detail_contains_builds(self, f_users, f_coprs, f_builds, f_db):
-        r = self.tc.get('/coprs/detail/{0}/{1}/builds/'.format(self.u1.name, self.c1.name))
+        r = self.tc.get('/coprs/{0}/{1}/builds/'.format(self.u1.name, self.c1.name))
         assert r.data.count('<tr class="build') == 2
 
     def test_copr_detail_anonymous_doesnt_contain_permissions_table_when_no_permissions(self, f_users, f_coprs, f_copr_permissions, f_db):
-        r = self.tc.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u1.name, self.c1.name))
+        r = self.tc.get('/coprs/{0}/{1}/permissions/'.format(self.u1.name, self.c1.name))
         assert '<table class="permissions"' not in r.data
 
     def test_copr_detail_contains_permissions_table(self, f_users, f_coprs, f_copr_permissions, f_db):
-        r = self.tc.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u2.name, self.c3.name))
+        r = self.tc.get('/coprs/{0}/{1}/permissions/'.format(self.u2.name, self.c3.name))
         assert '<table class="permissions-table"' in r.data
         assert '<td>{0}'.format(self.u3.name) in r.data
         assert '<td>{0}'.format(self.u1.name) in r.data
@@ -148,39 +148,39 @@ class TestCoprDetail(CoprsTestCase):
     @TransactionDecorator('u1')
     def test_copr_detail_allows_asking_for_permissions(self, f_users, f_coprs, f_copr_permissions, f_db):
         self.db.session.add_all([self.u2, self.c2])
-        r = self.test_client.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u2.name, self.c2.name))
+        r = self.test_client.get('/coprs/{0}/{1}/permissions/'.format(self.u2.name, self.c2.name))
         # u1 is approved builder, check for that
         assert '/permissions_applier_change/' in r.data
 
     @TransactionDecorator('u2')
     def test_copr_detail_doesnt_allow_owner_to_ask_for_permissions(self, f_users, f_coprs, f_db):
         self.db.session.add_all([self.u2, self.c2])
-        r = self.test_client.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u2.name, self.c2.name))
+        r = self.test_client.get('/coprs/{0}/{1}/permissions/'.format(self.u2.name, self.c2.name))
         assert '/permissions_applier_change/' not in r.data
 
     @TransactionDecorator('u2')
     def test_detail_has_correct_permissions_form(self, f_users, f_coprs, f_copr_permissions, f_db):
         self.db.session.add_all([self.u2, self.c3])
-        r = self.test_client.get('/coprs/detail/{0}/{1}/permissions/'.format(self.u2.name, self.c3.name))
+        r = self.test_client.get('/coprs/{0}/{1}/permissions/'.format(self.u2.name, self.c3.name))
 
         assert r.data.count('nothing') == 2
         assert '<select id="copr_builder_1" name="copr_builder_1">' in r.data
         assert '<select id="copr_admin_1" name="copr_admin_1">' in r.data
 
     def test_copr_detail_doesnt_show_cancel_build_for_anonymous(self, f_users, f_coprs, f_builds, f_db):
-        r = self.tc.get('/coprs/detail/{0}/{1}/'.format(self.u2.name, self.c2.name))
+        r = self.tc.get('/coprs/{0}/{1}/'.format(self.u2.name, self.c2.name))
         assert '/cancel_build/' not in r.data
 
     @TransactionDecorator('u1')
     def test_copr_detail_doesnt_allow_non_submitter_to_cancel_build(self, f_users, f_coprs, f_builds, f_db):
         self.db.session.add_all([self.u2, self.c2])
-        r = self.test_client.get('/coprs/detail/{0}/{1}/builds/'.format(self.u2.name, self.c2.name))
+        r = self.test_client.get('/coprs/{0}/{1}/builds/'.format(self.u2.name, self.c2.name))
         assert '/cancel_build/' not in r.data
 
     @TransactionDecorator('u2')
     def test_copr_detail_allows_submitter_to_cancel_build(self, f_users, f_coprs, f_builds, f_db):
         self.db.session.add_all([self.u2, self.c2])
-        r = self.test_client.get('/coprs/detail/{0}/{1}/builds/'.format(self.u2.name, self.c2.name))
+        r = self.test_client.get('/coprs/{0}/{1}/builds/'.format(self.u2.name, self.c2.name))
         assert '/cancel_build/' in r.data
 
 
@@ -189,7 +189,7 @@ class TestCoprEdit(CoprsTestCase):
     @TransactionDecorator('u1')
     def test_edit_prefills_id(self, f_users, f_coprs, f_db):
         self.db.session.add_all([self.u1, self.c1])
-        r = self.test_client.get('/coprs/detail/{0}/{1}/edit/'.format(self.u1.name, self.c1.name))
+        r = self.test_client.get('/coprs/{0}/{1}/edit/'.format(self.u1.name, self.c1.name))
         # TODO: use some kind of html parsing library to look for the hidden input, this ties us
         # to the precise format of the tag
         assert '<input hidden id="id" name="id" type="hidden" value="{0}">'.format(self.c1.id) in r.data
@@ -200,7 +200,7 @@ class TestCoprUpdate(CoprsTestCase):
     @TransactionDecorator('u1')
     def test_update_no_changes(self, f_users, f_coprs, f_mock_chroots, f_db):
         self.db.session.add_all([self.u1, self.c1])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/update/'.format(self.u1.name, self.c1.name),
+        r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u1.name, self.c1.name),
                    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
@@ -208,7 +208,7 @@ class TestCoprUpdate(CoprsTestCase):
     @TransactionDecorator('u1')
     def test_copr_admin_can_update(self, f_users, f_coprs, f_copr_permissions, f_mock_chroots, f_db):
         self.db.session.add_all([self.u2, self.c3])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/update/'.format(self.u2.name, self.c3.name),
+        r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u2.name, self.c3.name),
                    data = {'name': self.c3.name, 'fedora-rawhide-i386': 'y', 'id': self.c3.id},
                    follow_redirects = True)
         assert 'Copr was updated successfully' in r.data
@@ -216,7 +216,7 @@ class TestCoprUpdate(CoprsTestCase):
     @TransactionDecorator('u1')
     def test_update_multiple_chroots(self, f_users, f_coprs, f_copr_permissions, f_mock_chroots, f_db):
         self.db.session.add_all([self.u1, self.c1, self.mc1, self.mc2, self.mc3])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/update/'.format(self.u1.name, self.c1.name),
+        r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u1.name, self.c1.name),
                    data = {'name': self.c1.name, self.mc2.chroot_name: 'y', self.mc3.chroot_name: 'y', 'id': self.c1.id},
                    follow_redirects = True)
         assert 'Copr was updated successfully' in r.data
@@ -238,7 +238,7 @@ class TestCoprUpdate(CoprsTestCase):
         cc.mock_chroot = self.mc1
         self.c2.copr_chroots.append(cc)
 
-        r = self.test_client.post('/coprs/detail/{0}/{1}/update/'.format(self.u2.name, self.c2.name),
+        r = self.test_client.post('/coprs/{0}/{1}/update/'.format(self.u2.name, self.c2.name),
                    data = {'name': self.c2.name, self.mc1.chroot_name: 'y', 'id': self.c2.id},
                    follow_redirects = True)
         assert 'Copr was updated successfully' in r.data
@@ -253,7 +253,7 @@ class TestCoprApplyForPermissions(CoprsTestCase):
     @TransactionDecorator('u2')
     def test_apply(self, f_users, f_coprs, f_db):
         self.db.session.add_all([self.u1, self.u2, self.c1])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/permissions_applier_change/'.format(self.u1.name, self.c1.name),
+        r = self.test_client.post('/coprs/{0}/{1}/permissions_applier_change/'.format(self.u1.name, self.c1.name),
                    data = {'copr_builder': '1'},
                    follow_redirects = True)
         assert 'Successfuly updated' in r.data
@@ -269,7 +269,7 @@ class TestCoprApplyForPermissions(CoprsTestCase):
     @TransactionDecorator('u1')
     def test_apply_doesnt_lower_other_values_from_admin_to_request(self, f_users, f_coprs, f_copr_permissions, f_db):
         self.db.session.add_all([self.u1, self.u2, self.cp1, self.c2])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/permissions_applier_change/'.format(self.u2.name, self.c2.name),
+        r = self.test_client.post('/coprs/{0}/{1}/permissions_applier_change/'.format(self.u2.name, self.c2.name),
                    data = {'copr_builder': 1, 'copr_admin': '1'},
                    follow_redirects = True)
         assert 'Successfuly updated' in r.data
@@ -286,7 +286,7 @@ class TestCoprUpdatePermissions(CoprsTestCase):
     @TransactionDecorator('u2')
     def test_cancel_permission(self, f_users, f_coprs, f_copr_permissions, f_db):
         self.db.session.add_all([self.u2, self.c2])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/update_permissions/'.format(self.u2.name, self.c2.name),
+        r = self.test_client.post('/coprs/{0}/{1}/update_permissions/'.format(self.u2.name, self.c2.name),
                    data = {'copr_builder_1': '0'},
                    follow_redirects = True)
 
@@ -298,7 +298,7 @@ class TestCoprUpdatePermissions(CoprsTestCase):
     @TransactionDecorator('u2')
     def test_update_more_permissions(self, f_users, f_coprs, f_copr_permissions, f_db):
         self.db.session.add_all([self.u2, self.c3])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/update_permissions/'.format(self.u2.name, self.c3.name),
+        r = self.test_client.post('/coprs/{0}/{1}/update_permissions/'.format(self.u2.name, self.c3.name),
                    data = {'copr_builder_1': '2', 'copr_admin_1': '1', 'copr_admin_3': '2'},
                    follow_redirects = True)
         self.db.session.add_all([self.c3, self.u1, self.u3])
@@ -317,7 +317,7 @@ class TestCoprUpdatePermissions(CoprsTestCase):
     @TransactionDecorator('u1')
     def test_copr_admin_can_update_permissions(self, f_users, f_coprs, f_copr_permissions, f_db):
         self.db.session.add_all([self.u2, self.c3])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/update_permissions/'.format(self.u2.name, self.c3.name),
+        r = self.test_client.post('/coprs/{0}/{1}/update_permissions/'.format(self.u2.name, self.c3.name),
                    data = {'copr_builder_1': '2', 'copr_admin_3': '2'},
                    follow_redirects = True)
         assert 'Copr permissions were updated' in r.data
@@ -332,7 +332,7 @@ class TestCoprUpdatePermissions(CoprsTestCase):
         # the admin is the first one and therefore this fails if
         # the view doesn't reorder the permissions
         flexmock(self.models.Copr, copr_permissions=[self.cp3, self.cp2])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/update_permissions/'.format(self.u2.name, self.c3.name),
+        r = self.test_client.post('/coprs/{0}/{1}/update_permissions/'.format(self.u2.name, self.c3.name),
                    data = {'copr_admin_1': '1', 'copr_admin_3': '1'},
                    follow_redirects = True)
         self.db.session.add_all([self.u1, self.c3])
@@ -348,7 +348,7 @@ class TestCoprDelete(CoprsTestCase):
     @TransactionDecorator('u1')
     def test_delete(self, f_users, f_coprs, f_db):
         self.db.session.add_all([self.u1, self.c1])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/delete/'.format(self.u1.name, self.c1.name),
+        r = self.test_client.post('/coprs/{0}/{1}/delete/'.format(self.u1.name, self.c1.name),
                    data = {'verify': 'yes'},
                    follow_redirects = True)
         assert 'Copr was deleted successfully' in r.data
@@ -359,7 +359,7 @@ class TestCoprDelete(CoprsTestCase):
     @TransactionDecorator('u1')
     def test_copr_delete_does_not_delete_if_verify_filled_wrongly(self, f_users, f_coprs, f_db):
         self.db.session.add_all([self.u1, self.c1])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/delete/'.format(self.u1.name, self.c1.name),
+        r = self.test_client.post('/coprs/{0}/{1}/delete/'.format(self.u1.name, self.c1.name),
                    data = {'verify': 'no'},
                    follow_redirects = True)
         assert 'Copr was deleted successfully' not in r.data
@@ -369,7 +369,7 @@ class TestCoprDelete(CoprsTestCase):
     @TransactionDecorator('u2')
     def test_non_owner_cant_delete(self, f_users, f_coprs, f_db):
         self.db.session.add_all([self.u1, self.u2, self.c1])
-        r = self.test_client.post('/coprs/detail/{0}/{1}/delete/'.format(self.u1.name, self.c1.name),
+        r = self.test_client.post('/coprs/{0}/{1}/delete/'.format(self.u1.name, self.c1.name),
                    data = {'verify': 'yes'},
                    follow_redirects = True)
         self.db.session.add_all([self.c1])
@@ -388,22 +388,22 @@ class TestCoprRepoGeneration(CoprsTestCase):
         self.db.session.add_all([self.b5, self.b6, self.b7])
 
     def test_fail_on_missing_dash(self):
-        r = self.tc.get('/coprs/repo/reponamewithoutdash.repo')
+        r = self.tc.get('/coprs/reponamewithoutdash/repo/')
         assert r.status_code == 404
         assert 'Bad repository name' in r.data
 
     def test_fail_on_nonexistent_copr(self):
-        r = self.tc.get('/coprs/repo/bogus-nonexistent-repo.repo')
+        r = self.tc.get('/coprs/bogus-nonexistent-repo/repo/')
         assert r.status_code == 404
         assert 'bogus/nonexistent-repo does not exist' in r.data
 
     def test_fail_on_no_finished_builds(self, f_users,  f_coprs, f_db):
         r = self.tc.get(
-            '/coprs/repo/{0}-{1}.repo'.format(self.u1.name, self.c1.name))
+            '/coprs/{0}/{1}/repo/'.format(self.u1.name, self.c1.name))
         assert r.status_code == 404
         assert 'Repository not initialized' in r.data
 
     def test_works_on_older_builds(self, f_users, f_coprs, f_custom_builds, f_db):
-        r = self.tc.get('/coprs/repo/{0}-{1}.repo'.format(self.u1.name, self.c1.name))
+        r = self.tc.get('/coprs/{0}/{1}/repo/'.format(self.u1.name, self.c1.name))
         assert r.status_code == 200
         assert 'baseurl=foo://bar.baz' in r.data
-- 
1.8.3.1



More information about the copr-devel mailing list