allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [7/8] allura git commit: [#7887] ticket:790 Fix tests failing due to changes in iter_entry_points
Date Thu, 04 Jun 2015 21:27:28 GMT
[#7887] ticket:790 Fix tests failing due to changes in iter_entry_points


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/84219444
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/84219444
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/84219444

Branch: refs/heads/master
Commit: 84219444a12457158c6a418b86ca2fb55d2dacce
Parents: 1d9daf4
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu Jun 4 12:34:48 2015 +0000
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Thu Jun 4 12:34:48 2015 +0000

----------------------------------------------------------------------
 Allura/allura/tests/unit/test_package_path_loader.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/84219444/Allura/allura/tests/unit/test_package_path_loader.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/unit/test_package_path_loader.py b/Allura/allura/tests/unit/test_package_path_loader.py
index c3109c3..781ec83 100644
--- a/Allura/allura/tests/unit/test_package_path_loader.py
+++ b/Allura/allura/tests/unit/test_package_path_loader.py
@@ -43,16 +43,16 @@ class TestPackagePathLoader(TestCase):
 
         assert_equal(paths, [
             ['site-theme', None],
+            ['ep2', 'path:eps.ep2'],
             ['ep0', 'path:eps.ep0'],
             ['ep1', 'path:eps.ep1'],
-            ['ep2', 'path:eps.ep2'],
             ['allura', '/'],
         ])
         assert_equal(type(paths[0]), list)
         assert_equal(resource_filename.call_args_list, [
+            mock.call('eps.ep2', ''),
             mock.call('eps.ep0', ''),
             mock.call('eps.ep1', ''),
-            mock.call('eps.ep2', ''),
         ])
 
     @mock.patch('pkg_resources.iter_entry_points')
@@ -68,7 +68,7 @@ class TestPackagePathLoader(TestCase):
 
         order_rules, replacement_rules = PackagePathLoader()._load_rules()
 
-        assert_equal(order_rules, [('ep0', 'allura'), ('allura', 'ep2')])
+        assert_equal(order_rules, [('allura', 'ep2'), ('ep0', 'allura')])
         assert_equal(replacement_rules, {'allura': 'ep1'})
 
         eps = iter_entry_points.return_value.__iter__.return_value = [


Mime
View raw message