mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-03 04:37:06 -08:00
Robin H. Johnson
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
41 lines
2.2 KiB
Diff
41 lines
2.2 KiB
Diff
Fix tests to work with random hash dicts.
|
|
|
|
--- a/tests/test_functional/test_generation.py
|
|
+++ b/tests/test_functional/test_generation.py
|
|
@@ -205,13 +205,14 @@ class TestGeneration(unittest.TestCase):
|
|
requirements={'month':'\d{1,2}','day':'\d{1,2}'})
|
|
m.connect('viewpost/:id', controller='post', action='view')
|
|
m.connect(':controller/:action/:id')
|
|
-
|
|
- eq_('/blog/view?year=2004&month=blah', m.generate(controller='blog', action='view', year=2004, month='blah'))
|
|
+
|
|
+ url = m.generate(controller='blog', action='view', year=2004, month='blah')
|
|
+ assert url == '/blog/view?year=2004&month=blah' or url == '/blog/view?month=blah&year=2004'
|
|
eq_('/archive/2004/11', m.generate(controller='blog', action='view', year=2004, month=11))
|
|
eq_('/archive/2004/11', m.generate(controller='blog', action='view', year=2004, month='11'))
|
|
eq_('/archive/2004', m.generate(controller='blog', action='view', year=2004))
|
|
eq_('/viewpost/3', m.generate(controller='post', action='view', id=3))
|
|
-
|
|
+
|
|
def test_multiroute_with_splits(self):
|
|
m = Mapper(explicit=False)
|
|
m.minimization = True
|
|
@@ -219,13 +220,14 @@ class TestGeneration(unittest.TestCase):
|
|
requirements={'month':'\d{1,2}','day':'\d{1,2}'})
|
|
m.connect('viewpost/:(id)', controller='post', action='view')
|
|
m.connect(':(controller)/:(action)/:(id)')
|
|
-
|
|
- eq_('/blog/view?year=2004&month=blah', m.generate(controller='blog', action='view', year=2004, month='blah'))
|
|
+
|
|
+ url = m.generate(controller='blog', action='view', year=2004, month='blah')
|
|
+ assert url == '/blog/view?year=2004&month=blah' or url == '/blog/view?month=blah&year=2004'
|
|
eq_('/archive/2004/11', m.generate(controller='blog', action='view', year=2004, month=11))
|
|
eq_('/archive/2004/11', m.generate(controller='blog', action='view', year=2004, month='11'))
|
|
eq_('/archive/2004', m.generate(controller='blog', action='view', year=2004))
|
|
eq_('/viewpost/3', m.generate(controller='post', action='view', id=3))
|
|
-
|
|
+
|
|
def test_big_multiroute(self):
|
|
m = Mapper(explicit=False)
|
|
m.minimization = True
|