summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-07 23:10:02 -0800
committerSteve Piercy <web@stevepiercy.com>2016-12-13 17:39:00 -0800
commit0be0f1028ff8f996147ab275a403d6b99e43b932 (patch)
tree2543d6241fe4feb72e335129f8a20247e847fe71
parente96b2b5d5b9ebab33cd6eb84ef498dbaf4da18cb (diff)
downloadpyramid-0be0f1028ff8f996147ab275a403d6b99e43b932.tar.gz
pyramid-0be0f1028ff8f996147ab275a403d6b99e43b932.tar.bz2
pyramid-0be0f1028ff8f996147ab275a403d6b99e43b932.zip
fix proutes tests
-rw-r--r--pyramid/tests/test_scripts/test_proutes.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/pyramid/tests/test_scripts/test_proutes.py b/pyramid/tests/test_scripts/test_proutes.py
index aeaa57060..e0a5be93a 100644
--- a/pyramid/tests/test_scripts/test_proutes.py
+++ b/pyramid/tests/test_scripts/test_proutes.py
@@ -20,7 +20,7 @@ class TestPRoutesCommand(unittest.TestCase):
def _makeOne(self):
cmd = self._getTargetClass()([])
cmd.bootstrap = (dummy.DummyBootstrap(),)
- cmd.args = ('/foo/bar/myapp.ini#myapp',)
+ cmd.args.config_uri = ('/foo/bar/myapp.ini#myapp',)
return cmd
@@ -38,7 +38,8 @@ class TestPRoutesCommand(unittest.TestCase):
def test_good_args(self):
cmd = self._getTargetClass()([])
cmd.bootstrap = (dummy.DummyBootstrap(),)
- cmd.args = ('/foo/bar/myapp.ini#myapp', 'a=1')
+ cmd.args.config_uri = ('/foo/bar/myapp.ini#myapp',)
+ cmd.args.config_args = ('a=1',)
route = dummy.DummyRoute('a', '/a')
mapper = dummy.DummyMapper(route)
cmd._get_mapper = lambda *arg: mapper
@@ -52,7 +53,8 @@ class TestPRoutesCommand(unittest.TestCase):
def test_bad_args(self):
cmd = self._getTargetClass()([])
cmd.bootstrap = (dummy.DummyBootstrap(),)
- cmd.args = ('/foo/bar/myapp.ini#myapp', 'a')
+ cmd.args.config_uri = ('/foo/bar/myapp.ini#myapp',)
+ cmd.args.config_args = ('a',)
route = dummy.DummyRoute('a', '/a')
mapper = dummy.DummyMapper(route)
cmd._get_mapper = lambda *arg: mapper
@@ -586,7 +588,7 @@ class TestPRoutesCommand(unittest.TestCase):
)
command = self._makeOne()
- command.options.glob = '*foo*'
+ command.args.glob = '*foo*'
L = []
command.out = L.append
@@ -618,8 +620,8 @@ class TestPRoutesCommand(unittest.TestCase):
)
command = self._makeOne()
- command.options.glob = '*foo*'
- command.options.format = 'method,name'
+ command.args.glob = '*foo*'
+ command.args.format = 'method,name'
L = []
command.out = L.append
command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)
@@ -648,8 +650,8 @@ class TestPRoutesCommand(unittest.TestCase):
)
command = self._makeOne()
- command.options.glob = '*foo*'
- command.options.format = 'predicates,name,pattern'
+ command.args.glob = '*foo*'
+ command.args.format = 'predicates,name,pattern'
L = []
command.out = L.append
command.bootstrap = (dummy.DummyBootstrap(registry=config.registry),)