##// END OF EJS Templates
Fix race condition in javascript kernel message processing...
Fix race condition in javascript kernel message processing Because the binary messages are now deserialized using the asynchronous FileReader API, we need to have some way to force the messages to still be processed in the order they are received. This patch implements a simple processing queue using promises.

File last commit:

r19467:3b1da617
r20441:834cd9c4
Show More
test_configurable.py
378 lines | 11.0 KiB | text/x-python | PythonLexer
/ IPython / config / tests / test_configurable.py
Brian Granger
First draft of refactored Component->Configurable.
r2731 # encoding: utf-8
Min RK
test _config_default
r19467 """Tests for IPython.config.configurable"""
Brian Granger
First draft of refactored Component->Configurable.
r2731
Min RK
test _config_default
r19467 # Copyright (c) IPython Development Team.
# Distributed under the terms of the Modified BSD License.
Brian Granger
First draft of refactored Component->Configurable.
r2731
from unittest import TestCase
Brian Granger
Added SingletonConfigurable with instance method....
r3792 from IPython.config.configurable import (
Configurable,
SingletonConfigurable
)
Brian Granger
First draft of refactored Component->Configurable.
r2731 from IPython.utils.traitlets import (
MinRK
add tests for container extension methods in config
r12929 Integer, Float, Unicode, List, Dict, Set,
Brian Granger
First draft of refactored Component->Configurable.
r2731 )
Brian Granger
Added SingletonConfigurable with instance method....
r3792
Brian Granger
First draft of refactored Component->Configurable.
r2731 from IPython.config.loader import Config
Thomas Kluyver
Fix configurable test for Python 3.
r5351 from IPython.utils.py3compat import PY3
Brian Granger
First draft of refactored Component->Configurable.
r2731
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740 class MyConfigurable(Configurable):
MinRK
add Integer traitlet...
r5344 a = Integer(1, config=True, help="The integer a.")
MinRK
move shortname to Application...
r3852 b = Float(1.0, config=True, help="The integer b.")
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 c = Unicode('no config')
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740
Brian Granger
Added new tests for config.loader and configurable.
r3791 mc_help=u"""MyConfigurable options
----------------------
MinRK
add Integer traitlet...
r5344 --MyConfigurable.a=<Integer>
MinRK
catch up tests to recent changes...
r4029 Default: 1
Brian Granger
Added new tests for config.loader and configurable.
r3791 The integer a.
MinRK
parse cl_args agnostic of leading '-'...
r4189 --MyConfigurable.b=<Float>
MinRK
catch up tests to recent changes...
r4029 Default: 1.0
Brian Granger
Added new tests for config.loader and configurable.
r3791 The integer b."""
MinRK
allow using instance values in place of defaults in Configurable.class_get_help
r5224 mc_help_inst=u"""MyConfigurable options
----------------------
MinRK
add Integer traitlet...
r5344 --MyConfigurable.a=<Integer>
MinRK
allow using instance values in place of defaults in Configurable.class_get_help
r5224 Current: 5
The integer a.
--MyConfigurable.b=<Float>
Current: 4.0
The integer b."""
Thomas Kluyver
Fix configurable test for Python 3.
r5351 # On Python 3, the Integer trait is a synonym for Int
if PY3:
mc_help = mc_help.replace(u"<Integer>", u"<Int>")
mc_help_inst = mc_help_inst.replace(u"<Integer>", u"<Int>")
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740 class Foo(Configurable):
MinRK
add Integer traitlet...
r5344 a = Integer(0, config=True, help="The integer a.")
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 b = Unicode('nope', config=True)
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740
class Bar(Foo):
Thomas Kluyver
Eliminate Str and CStr trait types except in IPython.parallel
r4046 b = Unicode('gotit', config=False, help="The string b.")
MinRK
move shortname to Application...
r3852 c = Float(config=True, help="The string c.")
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740
Brian Granger
Added SingletonConfigurable with instance method....
r3792 class TestConfigurable(TestCase):
Brian Granger
First draft of refactored Component->Configurable.
r2731
def test_default(self):
c1 = Configurable()
c2 = Configurable(config=c1.config)
c3 = Configurable(config=c2.config)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(c1.config, c2.config)
self.assertEqual(c2.config, c3.config)
Brian Granger
First draft of refactored Component->Configurable.
r2731
def test_custom(self):
config = Config()
config.foo = 'foo'
config.bar = 'bar'
c1 = Configurable(config=config)
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740 c2 = Configurable(config=c1.config)
c3 = Configurable(config=c2.config)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(c1.config, config)
self.assertEqual(c2.config, config)
self.assertEqual(c3.config, config)
Brian Granger
First draft of refactored Component->Configurable.
r2731 # Test that copies are not made
Bradley M. Froehle
s/assert_/assertTrue/
r7876 self.assertTrue(c1.config is config)
self.assertTrue(c2.config is config)
self.assertTrue(c3.config is config)
self.assertTrue(c1.config is c2.config)
self.assertTrue(c2.config is c3.config)
Brian Granger
First draft of refactored Component->Configurable.
r2731
def test_inheritance(self):
config = Config()
config.MyConfigurable.a = 2
config.MyConfigurable.b = 2.0
c1 = MyConfigurable(config=config)
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740 c2 = MyConfigurable(config=c1.config)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(c1.a, config.MyConfigurable.a)
self.assertEqual(c1.b, config.MyConfigurable.b)
self.assertEqual(c2.a, config.MyConfigurable.a)
self.assertEqual(c2.b, config.MyConfigurable.b)
Brian Granger
First draft of refactored Component->Configurable.
r2731
def test_parent(self):
config = Config()
config.Foo.a = 10
config.Foo.b = "wow"
config.Bar.b = 'later'
config.Bar.c = 100.0
f = Foo(config=config)
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740 b = Bar(config=f.config)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(f.a, 10)
self.assertEqual(f.b, 'wow')
self.assertEqual(b.b, 'gotit')
self.assertEqual(b.c, 100.0)
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740
def test_override1(self):
config = Config()
config.MyConfigurable.a = 2
config.MyConfigurable.b = 2.0
c = MyConfigurable(a=3, config=config)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(c.a, 3)
self.assertEqual(c.b, config.MyConfigurable.b)
self.assertEqual(c.c, 'no config')
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740
def test_override2(self):
config = Config()
config.Foo.a = 1
config.Bar.b = 'or' # Up above b is config=False, so this won't do it.
config.Bar.c = 10.0
c = Bar(config=config)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(c.a, config.Foo.a)
self.assertEqual(c.b, 'gotit')
self.assertEqual(c.c, config.Bar.c)
Brian Granger
Adding support for HasTraits to take keyword arguments.
r2740 c = Bar(a=2, b='and', c=20.0, config=config)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(c.a, 2)
self.assertEqual(c.b, 'and')
self.assertEqual(c.c, 20.0)
Brian Granger
Added new tests for config.loader and configurable.
r3791
def test_help(self):
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(MyConfigurable.class_get_help(), mc_help)
Brian Granger
Added new tests for config.loader and configurable.
r3791
MinRK
allow using instance values in place of defaults in Configurable.class_get_help
r5224 def test_help_inst(self):
inst = MyConfigurable(a=5, b=4)
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(MyConfigurable.class_get_help(inst), mc_help_inst)
MinRK
allow using instance values in place of defaults in Configurable.class_get_help
r5224
Brian Granger
Added SingletonConfigurable with instance method....
r3792
class TestSingletonConfigurable(TestCase):
def test_instance(self):
class Foo(SingletonConfigurable): pass
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(Foo.initialized(), False)
Brian Granger
Added SingletonConfigurable with instance method....
r3792 foo = Foo.instance()
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(Foo.initialized(), True)
self.assertEqual(foo, Foo.instance())
self.assertEqual(SingletonConfigurable._instance, None)
Brian Granger
Added SingletonConfigurable with instance method....
r3792
def test_inheritance(self):
class Bar(SingletonConfigurable): pass
class Bam(Bar): pass
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(Bar.initialized(), False)
self.assertEqual(Bam.initialized(), False)
Brian Granger
Added SingletonConfigurable with instance method....
r3792 bam = Bam.instance()
bam == Bar.instance()
Bradley M. Froehle
s/assertEquals/assertEqual/
r7874 self.assertEqual(Bar.initialized(), True)
self.assertEqual(Bam.initialized(), True)
self.assertEqual(bam, Bam._instance)
self.assertEqual(bam, Bar._instance)
self.assertEqual(SingletonConfigurable._instance, None)
MinRK
add parent to Configurable...
r11062
class MyParent(Configurable):
pass
class MyParent2(MyParent):
pass
class TestParentConfigurable(TestCase):
def test_parent_config(self):
cfg = Config({
'MyParent' : {
'MyConfigurable' : {
'b' : 2.0,
}
}
})
parent = MyParent(config=cfg)
myc = MyConfigurable(parent=parent)
self.assertEqual(myc.b, parent.config.MyParent.MyConfigurable.b)
def test_parent_inheritance(self):
cfg = Config({
'MyParent' : {
'MyConfigurable' : {
'b' : 2.0,
}
}
})
parent = MyParent2(config=cfg)
myc = MyConfigurable(parent=parent)
self.assertEqual(myc.b, parent.config.MyParent.MyConfigurable.b)
MinRK
allow multi-level Config parentage...
r11069 def test_multi_parent(self):
cfg = Config({
'MyParent2' : {
'MyParent' : {
'MyConfigurable' : {
'b' : 2.0,
}
},
# this one shouldn't count
'MyConfigurable' : {
'b' : 3.0,
},
}
})
parent2 = MyParent2(config=cfg)
parent = MyParent(parent=parent2)
myc = MyConfigurable(parent=parent)
self.assertEqual(myc.b, parent.config.MyParent2.MyParent.MyConfigurable.b)
MinRK
add parent to Configurable...
r11062 def test_parent_priority(self):
cfg = Config({
'MyConfigurable' : {
'b' : 2.0,
},
'MyParent' : {
'MyConfigurable' : {
'b' : 3.0,
}
},
'MyParent2' : {
'MyConfigurable' : {
'b' : 4.0,
}
}
})
parent = MyParent2(config=cfg)
myc = MyConfigurable(parent=parent)
self.assertEqual(myc.b, parent.config.MyParent2.MyConfigurable.b)
MinRK
allow multi-level Config parentage...
r11069
def test_multi_parent_priority(self):
cfg = Config({
'MyConfigurable' : {
'b' : 2.0,
},
'MyParent' : {
'MyConfigurable' : {
'b' : 3.0,
}
},
'MyParent2' : {
'MyConfigurable' : {
'b' : 4.0,
}
},
'MyParent2' : {
'MyParent' : {
'MyConfigurable' : {
'b' : 5.0,
}
}
}
})
parent2 = MyParent2(config=cfg)
parent = MyParent2(parent=parent2)
myc = MyConfigurable(parent=parent)
self.assertEqual(myc.b, parent.config.MyParent2.MyParent.MyConfigurable.b)
MinRK
add tests for container extension methods in config
r12929 class Containers(Configurable):
lis = List(config=True)
def _lis_default(self):
return [-1]
s = Set(config=True)
def _s_default(self):
return {'a'}
d = Dict(config=True)
def _d_default(self):
return {'a' : 'b'}
class TestConfigContainers(TestCase):
def test_extend(self):
c = Config()
Thomas Kluyver
Fix config test
r13395 c.Containers.lis.extend(list(range(5)))
MinRK
add tests for container extension methods in config
r12929 obj = Containers(config=c)
Thomas Kluyver
Fix config test
r13395 self.assertEqual(obj.lis, list(range(-1,5)))
MinRK
add tests for container extension methods in config
r12929
def test_insert(self):
c = Config()
c.Containers.lis.insert(0, 'a')
c.Containers.lis.insert(1, 'b')
obj = Containers(config=c)
self.assertEqual(obj.lis, ['a', 'b', -1])
def test_prepend(self):
c = Config()
c.Containers.lis.prepend([1,2])
c.Containers.lis.prepend([2,3])
obj = Containers(config=c)
self.assertEqual(obj.lis, [2,3,1,2,-1])
def test_prepend_extend(self):
c = Config()
c.Containers.lis.prepend([1,2])
c.Containers.lis.extend([2,3])
obj = Containers(config=c)
self.assertEqual(obj.lis, [1,2,-1,2,3])
def test_append_extend(self):
c = Config()
c.Containers.lis.append([1,2])
c.Containers.lis.extend([2,3])
obj = Containers(config=c)
self.assertEqual(obj.lis, [-1,[1,2],2,3])
def test_extend_append(self):
c = Config()
c.Containers.lis.extend([2,3])
c.Containers.lis.append([1,2])
obj = Containers(config=c)
self.assertEqual(obj.lis, [-1,2,3,[1,2]])
def test_insert_extend(self):
c = Config()
c.Containers.lis.insert(0, 1)
c.Containers.lis.extend([2,3])
obj = Containers(config=c)
self.assertEqual(obj.lis, [1,-1,2,3])
def test_set_update(self):
c = Config()
c.Containers.s.update({0,1,2})
c.Containers.s.update({3})
obj = Containers(config=c)
self.assertEqual(obj.s, {'a', 0, 1, 2, 3})
def test_dict_update(self):
c = Config()
c.Containers.d.update({'c' : 'd'})
c.Containers.d.update({'e' : 'f'})
obj = Containers(config=c)
self.assertEqual(obj.d, {'a':'b', 'c':'d', 'e':'f'})
MinRK
copy values in Config.merge
r13471 def test_update_twice(self):
c = Config()
c.MyConfigurable.a = 5
m = MyConfigurable(config=c)
self.assertEqual(m.a, 5)
c2 = Config()
c2.MyConfigurable.a = 10
m.update_config(c2)
self.assertEqual(m.a, 10)
c2.MyConfigurable.a = 15
m.update_config(c2)
self.assertEqual(m.a, 15)
Min RK
test _config_default
r19467 def test_config_default(self):
class SomeSingleton(SingletonConfigurable):
pass
class DefaultConfigurable(Configurable):
a = Integer(config=True)
def _config_default(self):
if SomeSingleton.initialized():
return SomeSingleton.instance().config
return Config()
c = Config()
c.DefaultConfigurable.a = 5
d1 = DefaultConfigurable()
self.assertEqual(d1.a, 0)
single = SomeSingleton.instance(config=c)
d2 = DefaultConfigurable()
self.assertIs(d2.config, single.config)
self.assertEqual(d2.a, 5)
MinRK
add tests for container extension methods in config
r12929