##// END OF EJS Templates
Merge pull request #1627 from minrk/msgspec...
Merge pull request #1627 from minrk/msgspec Test the Message Spec and add our zmq subpackage to the test suite. It uses Traitlets to perform validation of keys. Checks right now are not very strict, as (almost) any key is allowed to be None, as long as it is defined. This is because I simply do not know which keys are allowed to be None, and this is not discussed in the specification. If no keys are allowed to be None, we violate that all over the place. Parametric tests are used, so every key validation counts as a test (147!). Message spec doc was found to misrepresent code in a few points, and some changes were made: * spec had error keys as `exc_name/value`, but we are actually using `ename/value` (docs updated to match code) * payloads were inaccurate - list of dicts, rather than single dict, and transformed_output is a payload, not top-level in exec-reply (docs update to match code). * in oinfo_request, detail_level was in message spec, but not actually implemented (code updated to match docs). History messages are not yet tested, but I think I get at least elementary coverage of everything else in the doc.

File last commit:

r5390:c82649ea
r6567:232fa81a merge
Show More
test_loader.py
255 lines | 8.1 KiB | text/x-python | PythonLexer
Brian Granger
Work on Application and loader testing.
r2187 # encoding: utf-8
"""
Tests for IPython.config.loader
Authors:
* Brian Granger
* Fernando Perez (design help)
"""
#-----------------------------------------------------------------------------
Matthias BUSSONNIER
update copyright to 2011/20xx-2011...
r5390 # Copyright (C) 2008-2011 The IPython Development Team
Brian Granger
Work on Application and loader testing.
r2187 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
import os
MinRK
fix handling of unicode in KV loader...
r4162 import sys
Brian Granger
Work on Application and loader testing.
r2187 from tempfile import mkstemp
from unittest import TestCase
MinRK
fix handling of unicode in KV loader...
r4162 from nose import SkipTest
MinRK
aliases match flag pattern ('-' as wordsep, not '_')...
r4214 from IPython.testing.tools import mute_warn
MinRK
add Integer traitlet...
r5344 from IPython.utils.traitlets import Unicode
Brian Granger
Added new tests for config.loader and configurable.
r3791 from IPython.config.configurable import Configurable
Brian Granger
Massive refactoring of of the core....
r2245 from IPython.config.loader import (
Config,
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 PyFileConfigLoader,
KeyValueConfigLoader,
Brian Granger
Massive refactoring of of the core....
r2245 ArgParseConfigLoader,
MinRK
fix type=str->unicode in argparse kv loader...
r4830 KVArgParseConfigLoader,
Brian Granger
Massive refactoring of of the core....
r2245 ConfigError
)
Brian Granger
Work on Application and loader testing.
r2187
#-----------------------------------------------------------------------------
# Actual tests
#-----------------------------------------------------------------------------
pyfile = """
Fernando Perez
Fix failing config test: https://bugs.launchpad.net/ipython/+bug/503731...
r2394 c = get_config()
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 c.a=10
c.b=20
c.Foo.Bar.value=10
Thomas Kluyver
Fix config loader test for Python 3.
r4762 c.Foo.Bam.value=list(range(10)) # list() is just so it's the same on Python 3
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 c.D.C.value='hi there'
Brian Granger
Work on Application and loader testing.
r2187 """
class TestPyFileCL(TestCase):
def test_basic(self):
Fernando Perez
Progress towards getting the test suite in shape again....
r2392 fd, fname = mkstemp('.py')
Brian Granger
Work on Application and loader testing.
r2187 f = os.fdopen(fd, 'w')
f.write(pyfile)
f.close()
Brian Granger
Minor changes to a few files to reflect design discussion.
r2198 # Unlink the file
Brian Granger
Work on Application and loader testing.
r2187 cl = PyFileConfigLoader(fname)
config = cl.load_config()
Brian Granger
Massive refactoring of of the core....
r2245 self.assertEquals(config.a, 10)
self.assertEquals(config.b, 20)
self.assertEquals(config.Foo.Bar.value, 10)
self.assertEquals(config.Foo.Bam.value, range(10))
self.assertEquals(config.D.C.value, 'hi there')
Brian Granger
Work on Application and loader testing.
r2187
Brian Granger
Refactored the command line config system and other aspects of config....
r2501 class MyLoader1(ArgParseConfigLoader):
MinRK
use cfg._merge instead of update in loader...
r4606 def _add_arguments(self, aliases=None, flags=None):
Brian Granger
Refactored the command line config system and other aspects of config....
r2501 p = self.parser
p.add_argument('-f', '--foo', dest='Global.foo', type=str)
p.add_argument('-b', dest='MyClass.bar', type=int)
p.add_argument('-n', dest='n', action='store_true')
p.add_argument('Global.bam', type=str)
class MyLoader2(ArgParseConfigLoader):
MinRK
use cfg._merge instead of update in loader...
r4606 def _add_arguments(self, aliases=None, flags=None):
Brian Granger
Refactored the command line config system and other aspects of config....
r2501 subparsers = self.parser.add_subparsers(dest='subparser_name')
subparser1 = subparsers.add_parser('1')
subparser1.add_argument('-x',dest='Global.x')
subparser2 = subparsers.add_parser('2')
subparser2.add_argument('y')
Brian Granger
Work on the config system....
r2500
Brian Granger
Work on Application and loader testing.
r2187 class TestArgParseCL(TestCase):
def test_basic(self):
Brian Granger
Refactored the command line config system and other aspects of config....
r2501 cl = MyLoader1()
Brian Granger
Work on Application and loader testing.
r2187 config = cl.load_config('-f hi -b 10 -n wow'.split())
Brian Granger
Massive refactoring of of the core....
r2245 self.assertEquals(config.Global.foo, 'hi')
self.assertEquals(config.MyClass.bar, 10)
self.assertEquals(config.n, True)
self.assertEquals(config.Global.bam, 'wow')
Brian Granger
Work on the config system....
r2500 config = cl.load_config(['wow'])
self.assertEquals(config.keys(), ['Global'])
self.assertEquals(config.Global.keys(), ['bam'])
self.assertEquals(config.Global.bam, 'wow')
Brian Granger
Work on Application and loader testing.
r2187
def test_add_arguments(self):
Brian Granger
Refactored the command line config system and other aspects of config....
r2501 cl = MyLoader2()
Brian Granger
Work on Application and loader testing.
r2187 config = cl.load_config('2 frobble'.split())
self.assertEquals(config.subparser_name, '2')
self.assertEquals(config.y, 'frobble')
config = cl.load_config('1 -x frobble'.split())
self.assertEquals(config.subparser_name, '1')
Brian Granger
Massive refactoring of of the core....
r2245 self.assertEquals(config.Global.x, 'frobble')
Brian Granger
Work on the config system....
r2500 def test_argv(self):
Brian Granger
Refactored the command line config system and other aspects of config....
r2501 cl = MyLoader1(argv='-f hi -b 10 -n wow'.split())
Brian Granger
Work on the config system....
r2500 config = cl.load_config()
self.assertEquals(config.Global.foo, 'hi')
self.assertEquals(config.MyClass.bar, 10)
self.assertEquals(config.n, True)
self.assertEquals(config.Global.bam, 'wow')
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 class TestKeyValueCL(TestCase):
MinRK
fix type=str->unicode in argparse kv loader...
r4830 klass = KeyValueConfigLoader
Brian Granger
Added KeyValueConfigLoader with tests.
r3786
def test_basic(self):
MinRK
fix type=str->unicode in argparse kv loader...
r4830 cl = self.klass()
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 argv = ['--'+s.strip('c.') for s in pyfile.split('\n')[2:-1]]
MinRK
aliases match flag pattern ('-' as wordsep, not '_')...
r4214 with mute_warn():
config = cl.load_config(argv)
Brian Granger
Added KeyValueConfigLoader with tests.
r3786 self.assertEquals(config.a, 10)
self.assertEquals(config.b, 20)
self.assertEquals(config.Foo.Bar.value, 10)
self.assertEquals(config.Foo.Bam.value, range(10))
self.assertEquals(config.D.C.value, 'hi there')
MinRK
allow extra_args in applications
r3958
MinRK
expand '~' with path.expanduser in KVLoader...
r5189 def test_expanduser(self):
cl = self.klass()
argv = ['--a=~/1/2/3', '--b=~', '--c=~/', '--d="~/"']
with mute_warn():
config = cl.load_config(argv)
self.assertEquals(config.a, os.path.expanduser('~/1/2/3'))
self.assertEquals(config.b, os.path.expanduser('~'))
self.assertEquals(config.c, os.path.expanduser('~/'))
self.assertEquals(config.d, '~/')
MinRK
allow extra_args in applications
r3958 def test_extra_args(self):
MinRK
fix type=str->unicode in argparse kv loader...
r4830 cl = self.klass()
MinRK
aliases match flag pattern ('-' as wordsep, not '_')...
r4214 with mute_warn():
config = cl.load_config(['--a=5', 'b', '--c=10', 'd'])
MinRK
don't stop parsing on unrecognized args...
r4211 self.assertEquals(cl.extra_args, ['b', 'd'])
MinRK
allow extra_args in applications
r3958 self.assertEquals(config.a, 5)
MinRK
don't stop parsing on unrecognized args...
r4211 self.assertEquals(config.c, 10)
MinRK
aliases match flag pattern ('-' as wordsep, not '_')...
r4214 with mute_warn():
config = cl.load_config(['--', '--a=5', '--c=10'])
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 self.assertEquals(cl.extra_args, ['--a=5', '--c=10'])
MinRK
fix handling of unicode in KV loader...
r4162
def test_unicode_args(self):
MinRK
fix type=str->unicode in argparse kv loader...
r4830 cl = self.klass()
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 argv = [u'--a=épsîlön']
MinRK
aliases match flag pattern ('-' as wordsep, not '_')...
r4214 with mute_warn():
config = cl.load_config(argv)
MinRK
fix handling of unicode in KV loader...
r4162 self.assertEquals(config.a, u'épsîlön')
def test_unicode_bytes_args(self):
MinRK
disallow no-prefix `ipython foo=bar` argument style....
r4197 uarg = u'--a=é'
MinRK
fix handling of unicode in KV loader...
r4162 try:
barg = uarg.encode(sys.stdin.encoding)
except (TypeError, UnicodeEncodeError):
raise SkipTest("sys.stdin.encoding can't handle 'é'")
MinRK
fix type=str->unicode in argparse kv loader...
r4830 cl = self.klass()
MinRK
aliases match flag pattern ('-' as wordsep, not '_')...
r4214 with mute_warn():
config = cl.load_config([barg])
MinRK
fix handling of unicode in KV loader...
r4162 self.assertEquals(config.a, u'é')
MinRK
fix type=str->unicode in argparse kv loader...
r4830
def test_unicode_alias(self):
cl = self.klass()
argv = [u'--a=épsîlön']
with mute_warn():
config = cl.load_config(argv, aliases=dict(a='A.a'))
self.assertEquals(config.A.a, u'épsîlön')
Brian Granger
Added KeyValueConfigLoader with tests.
r3786
MinRK
fix type=str->unicode in argparse kv loader...
r4830 class TestArgParseKVCL(TestKeyValueCL):
klass = KVArgParseConfigLoader
Brian Granger
Added new tests for config.loader and configurable.
r3791
MinRK
expand '~' with path.expanduser in KVLoader...
r5189 def test_expanduser2(self):
cl = self.klass()
argv = ['-a', '~/1/2/3', '--b', "'~/1/2/3'"]
with mute_warn():
config = cl.load_config(argv, aliases=dict(a='A.a', b='A.b'))
self.assertEquals(config.A.a, os.path.expanduser('~/1/2/3'))
self.assertEquals(config.A.b, '~/1/2/3')
Brian Granger
Massive refactoring of of the core....
r2245 class TestConfig(TestCase):
def test_setget(self):
c = Config()
c.a = 10
self.assertEquals(c.a, 10)
self.assertEquals(c.has_key('b'), False)
def test_auto_section(self):
c = Config()
self.assertEquals(c.has_key('A'), True)
self.assertEquals(c._has_section('A'), False)
A = c.A
A.foo = 'hi there'
self.assertEquals(c._has_section('A'), True)
self.assertEquals(c.A.foo, 'hi there')
del c.A
self.assertEquals(len(c.A.keys()),0)
def test_merge_doesnt_exist(self):
c1 = Config()
c2 = Config()
c2.bar = 10
c2.Foo.bar = 10
c1._merge(c2)
self.assertEquals(c1.Foo.bar, 10)
self.assertEquals(c1.bar, 10)
c2.Bar.bar = 10
c1._merge(c2)
self.assertEquals(c1.Bar.bar, 10)
def test_merge_exists(self):
c1 = Config()
c2 = Config()
c1.Foo.bar = 10
c1.Foo.bam = 30
c2.Foo.bar = 20
c2.Foo.wow = 40
c1._merge(c2)
self.assertEquals(c1.Foo.bam, 30)
self.assertEquals(c1.Foo.bar, 20)
self.assertEquals(c1.Foo.wow, 40)
c2.Foo.Bam.bam = 10
c1._merge(c2)
self.assertEquals(c1.Foo.Bam.bam, 10)
def test_deepcopy(self):
c1 = Config()
c1.Foo.bar = 10
c1.Foo.bam = 30
c1.a = 'asdf'
c1.b = range(10)
import copy
c2 = copy.deepcopy(c1)
self.assertEquals(c1, c2)
self.assert_(c1 is not c2)
self.assert_(c1.Foo is not c2.Foo)
def test_builtin(self):
c1 = Config()
exec 'foo = True' in c1
self.assertEquals(c1.foo, True)
self.assertRaises(ConfigError, setattr, c1, 'ValueError', 10)