commit ebddbf2bb7e920e61e2f38f6be3870575802b9a7
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Fri Nov 21 15:34:13 2014 +0100
Adjust the test suite for the behavioral changes of pkgdb2 1.21
test.py | 61 ++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 32 insertions(+), 29 deletions(-)
---
diff --git a/test.py b/test.py
index 6067450..dfb1059 100644
--- a/test.py
+++ b/test.py
@@ -181,15 +181,18 @@ class TestPkgdDB(unittest.TestCase):
def test_get_packages(self):
''' Test the get_packages function. '''
out = self.pkgdb.get_packages('gua*')
+
+ expected_keys = [
+ 'acls', 'creation_date', 'description', 'monitor', 'name',
+ 'review_url', 'status', 'summary', 'upstream_url',
+ ]
+
self.assertEqual(
sorted(out.keys()),
['output', 'packages', 'page', 'page_total'])
self.assertEqual(len(out['packages']), 10)
self.assertEqual(out['packages'][0]['name'], 'guacamole-client')
- self.assertEqual(
- sorted(out['packages'][0].keys()),
- ['acls', 'creation_date', 'description', 'name', 'review_url',
- 'status', 'summary', 'upstream_url'])
+ self.assertEqual(sorted(out['packages'][0].keys()), expected_keys)
self.assertEqual(out['packages'][1]['name'], 'guacamole-common')
self.assertEqual(out['page'], 1)
self.assertEqual(out['page_total'], 1)
@@ -200,10 +203,7 @@ class TestPkgdDB(unittest.TestCase):
['output', 'packages', 'page', 'page_total'])
self.assertEqual(len(out['packages']), 7)
self.assertEqual(out['packages'][0]['name'], 'guacamole-common')
- self.assertEqual(
- sorted(out['packages'][0].keys()),
- ['acls', 'creation_date', 'description', 'name', 'review_url',
- 'status', 'summary', 'upstream_url'])
+ self.assertEqual(sorted(out['packages'][0].keys()), expected_keys)
self.assertEqual(out['packages'][1]['name'], 'guacamole-ext')
self.assertEqual(out['page'], 1)
self.assertEqual(out['page_total'], 1)
@@ -214,10 +214,7 @@ class TestPkgdDB(unittest.TestCase):
['output', 'packages', 'page', 'page_total'])
self.assertEqual(len(out['packages']), 1)
self.assertEqual(out['packages'][0]['name'], 'guake')
- self.assertEqual(
- sorted(out['packages'][0].keys()),
- ['acls', 'creation_date', 'description', 'name', 'review_url',
- 'status', 'summary', 'upstream_url'])
+ self.assertEqual(sorted(out['packages'][0].keys()), expected_keys)
self.assertEqual(out['page'], 1)
self.assertEqual(out['page_total'], 1)
@@ -227,10 +224,7 @@ class TestPkgdDB(unittest.TestCase):
['output', 'packages', 'page', 'page_total'])
self.assertEqual(len(out['packages']), 5)
self.assertEqual(out['packages'][0]['name'], 'guacd')
- self.assertEqual(
- sorted(out['packages'][0].keys()),
- ['acls', 'creation_date', 'description', 'name', 'review_url',
- 'status', 'summary', 'upstream_url'])
+ self.assertEqual(sorted(out['packages'][0].keys()), expected_keys)
self.assertEqual(out['page'], 1)
self.assertEqual(out['page_total'], 1)
@@ -240,11 +234,8 @@ class TestPkgdDB(unittest.TestCase):
['output', 'packages', 'page', 'page_total'])
self.assertTrue(len(out['packages']) >= 44)
self.assertEqual(out['packages'][0]['name'], 'ghex')
- self.assertEqual(
- sorted(out['packages'][0].keys()),
- ['acls', 'creation_date', 'description', 'name', 'review_url',
- 'status', 'summary', 'upstream_url'])
- self.assertEqual(out['packages'][1]['name'], 'glom')
+ self.assertEqual(sorted(out['packages'][0].keys()), expected_keys)
+ #self.assertEqual(out['packages'][1]['name'], 'glom')
self.assertEqual(out['page'], 1)
self.assertEqual(out['page_total'], 1)
@@ -254,10 +245,7 @@ class TestPkgdDB(unittest.TestCase):
['output', 'packages', 'page', 'page_total'])
self.assertEqual(len(out['packages']), 1)
self.assertEqual(out['packages'][0]['name'], 'guake')
- self.assertEqual(
- sorted(out['packages'][0].keys()),
- ['acls', 'creation_date', 'description', 'name', 'review_url',
- 'status', 'summary', 'upstream_url'])
+ self.assertEqual(sorted(out['packages'][0].keys()), expected_keys)
self.assertEqual(out['page'], 1)
self.assertEqual(out['page_total'], 1)
@@ -267,10 +255,7 @@ class TestPkgdDB(unittest.TestCase):
['output', 'packages', 'page', 'page_total'])
self.assertEqual(len(out['packages']), 250)
self.assertEqual(out['packages'][0]['name'], 'ghc-parameterized-data')
- self.assertEqual(
- sorted(out['packages'][0].keys()),
- ['acls', 'creation_date', 'description', 'name', 'review_url',
- 'status', 'summary', 'upstream_url'])
+ self.assertEqual(sorted(out['packages'][0].keys()), expected_keys)
self.assertEqual(out['page'], 2)
self.assertEqual(out['page_total'], 6)
@@ -433,6 +418,24 @@ class TestPkgdDBAuth(unittest.TestCase):
def test_07_update_acl(self):
''' Test the update_acl function. '''
+ # After un-retiring the package on master, we need to re-set Ralph's
+ # pending ACL request
+ out = self.pkgdb.update_acl(
+ 'guake', ['master', 'el6'], 'commit', 'Awaiting Review',
+ 'ralph')
+
+ self.assertEqual(
+ sorted(out.keys()),
+ ['messages', 'output'])
+
+ self.assertEqual(out['output'], 'ok')
+ self.assertEqual(
+ out['messages'],
+ ['user: pingou set for ralph acl: commit of package: guake from: '
+ 'Obsolete to: Awaiting Review on branch: master',
+ 'Nothing to update on branch: el6 for acl: commit'])
+
+ # Check the output when we try to change an ACL to what it is already
out = self.pkgdb.update_acl(
'guake', ['master', 'el6'], 'commit', 'Awaiting Review',
'ralph')