BIND 10 trac2117, updated. 080ad4247947f77fee4da42244c200dcafb1088a add check for more lib/python stuff
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Aug 30 18:16:46 UTC 2012
The branch, trac2117 has been updated
via 080ad4247947f77fee4da42244c200dcafb1088a (commit)
from 868d91a3c6aa44a1fb5f72c0453755c2ba61d712 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 080ad4247947f77fee4da42244c200dcafb1088a
Author: Francis Dupont <fdupont at isc.org>
Date: Thu Aug 30 20:16:19 2012 +0200
add check for more lib/python stuff
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/factory.cc | 13 +-
src/lib/datasrc/tests/factory_unittest.cc | 15 +-
src/lib/python/isc/config/cfgmgr.py | 2 +-
src/lib/python/isc/config/tests/ccsession_test.py | 4 +-
src/lib/python/isc/config/tests/cfgmgr_test.py | 30 +--
.../python/isc/config/tests/config_data_test.py | 60 +++---
.../python/isc/config/tests/module_spec_test.py | 2 +-
src/lib/python/isc/datasrc/tests/datasrc_test.py | 4 +-
.../python/isc/datasrc/tests/sqlite3_ds_test.py | 4 +-
src/lib/python/isc/ddns/tests/session_tests.py | 4 +-
src/lib/python/isc/log/tests/check_output-win32.sh | 3 +-
src/lib/python/isc/notify/notify_out.py | 2 +-
src/lib/python/isc/notify/tests/notify_out_test.py | 5 +-
src/lib/python/isc/util/socketpair.py | 4 +-
src/lib/python/isc/util/socketserver_mixin.py | 2 +-
.../pyunittests_util/pyunittests_util.vcxproj | 2 +-
win32build/check/datasrc-debug | 4 +-
win32build/check/datasrc-release | 4 +-
win32build/check/dhcp6-debug | 4 +-
win32build/check/dhcp6-release | 4 +-
win32build/check/dns++-debug | 4 +-
win32build/check/dns++-release | 4 +-
win32build/check/log-debug | 14 +-
win32build/check/log-release | 14 +-
win32build/check/python-debug | 197 ++++++++++----------
win32build/check/python-release | 197 ++++++++++----------
26 files changed, 296 insertions(+), 306 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/factory.cc b/src/lib/datasrc/factory.cc
index af54d29..d238795 100644
--- a/src/lib/datasrc/factory.cc
+++ b/src/lib/datasrc/factory.cc
@@ -62,11 +62,7 @@ getDataSourceLibFile(const std::string& type) {
std::string lib_file = type;
const int ext_pos = lib_file.rfind(".so");
if (ext_pos == std::string::npos || ext_pos + 3 != lib_file.length()) {
-#if !defined(_WIN32) || !defined(_DEBUG)
lib_file.append("_ds.so");
-#else
- lib_file.append("_dsD.so");
-#endif
}
// And if it is not an absolute path, prepend it with our
// loadable backend library path
@@ -116,14 +112,11 @@ LibraryContainer::LibraryContainer(const std::string& name) {
": " << strerror(GetLastError()));
}
#else
- if ((strcmp(name.c_str(), "sqlite3_ds.so") == 0) ||
- (strcmp(name.c_str(), "sqlite3_dsD.so") == 0))
+ if (strcmp(name.c_str(), "sqlite3_ds.so") == 0)
ds_lib_ = 1;
- else if ((strcmp(name.c_str(), "memory_ds.so") == 0) ||
- (strcmp(name.c_str(), "memory_dsD.so") == 0))
+ else if (strcmp(name.c_str(), "memory_ds.so") == 0)
ds_lib_ = 2;
- else if ((strcmp(name.c_str(), "static_ds.so") == 0) ||
- (strcmp(name.c_str(), "static_dsD.so") == 0))
+ else if (strcmp(name.c_str(), "static_ds.so") == 0)
ds_lib_ = 3;
else {
isc_throw(DataSourceLibraryError,
diff --git a/src/lib/datasrc/tests/factory_unittest.cc b/src/lib/datasrc/tests/factory_unittest.cc
index 01fd269..84c36fa 100644
--- a/src/lib/datasrc/tests/factory_unittest.cc
+++ b/src/lib/datasrc/tests/factory_unittest.cc
@@ -70,11 +70,7 @@ TEST(FactoryTest, paths) {
pathtestHelper("/no_such_file.so", error + "/no_such_file.so");
// If no ending in .so, it should get _ds.so
-#if !defined(_WIN32) || !defined(_DEBUG)
pathtestHelper("/no_such_file", error + "/no_such_file_ds.so");
-#else
- pathtestHelper("/no_such_file", error + "/no_such_file_dsD.so");
-#endif
// If not starting with /, path should be added. For this test that
// means the build directory as set in B10_FROM_BUILD
@@ -93,7 +89,7 @@ TEST(FactoryTest, paths) {
pathtestHelper("no_such_file.so", error + builddir +
"/win32build/VS2010/Debug/no_such_file.so");
pathtestHelper("no_such_file", error + builddir +
- "/win32build/VS2010/Debug/no_such_file_dsD.so");
+ "/win32build/VS2010/Debug/no_such_file_ds.so");
#endif
#endif
@@ -107,16 +103,11 @@ TEST(FactoryTest, paths) {
"/win32build/VS2010/Release/no_such_file.so.something_ds.so");
#else
pathtestHelper("no_such_file.so.something", error + builddir +
- "/win32build/VS2010/Debug/no_such_file.so.something_dsD.so");
+ "/win32build/VS2010/Debug/no_such_file.so.something_ds.so");
#endif
#endif
-#if !defined(_WIN32) || !defined(_DEBUG)
pathtestHelper("/no_such_file.so.something", error +
"/no_such_file.so.something_ds.so");
-#else
- pathtestHelper("/no_such_file.so.something", error +
- "/no_such_file.so.something_dsD.so");
-#endif
pathtestHelper("/no_such_file.so.something.so", error +
"/no_such_file.so.something.so");
pathtestHelper("/no_such_file.so.so", error +
@@ -130,7 +121,7 @@ TEST(FactoryTest, paths) {
"/win32build/VS2010/Release/no_such_file.so.something_ds.so");
#else
pathtestHelper("no_such_file.so.something", error + builddir +
- "/win32build/VS2010/Debug/no_such_file.so.something_dsD.so");
+ "/win32build/VS2010/Debug/no_such_file.so.something_ds.so");
#endif
#endif
diff --git a/src/lib/python/isc/config/cfgmgr.py b/src/lib/python/isc/config/cfgmgr.py
index aa0547b..d401b47 100644
--- a/src/lib/python/isc/config/cfgmgr.py
+++ b/src/lib/python/isc/config/cfgmgr.py
@@ -65,7 +65,7 @@ class ConfigManagerData:
self.db_filename = file_name
self.data_path = os.path.dirname(file_name)
else:
- self.db_filename = data_path + os.sep + file_name
+ self.db_filename = data_path + '/' + file_name
self.data_path = data_path
def read_from_file(data_path, file_name):
diff --git a/src/lib/python/isc/config/tests/ccsession_test.py b/src/lib/python/isc/config/tests/ccsession_test.py
index d1060bf..11ac521 100644
--- a/src/lib/python/isc/config/tests/ccsession_test.py
+++ b/src/lib/python/isc/config/tests/ccsession_test.py
@@ -106,7 +106,7 @@ class TestModuleCCSession(unittest.TestCase):
self.data_path = "../../../testdata"
def spec_file(self, file):
- return self.data_path + os.sep + file
+ return self.data_path + '/' + file
def create_session(self, spec_file_name, config_handler = None,
command_handler = None, cc_session = None):
@@ -918,7 +918,7 @@ class TestUIModuleCCSession(unittest.TestCase):
self.data_path = "../../../testdata"
def spec_file(self, file):
- return self.data_path + os.sep + file
+ return self.data_path + '/' + file
def create_uccs2(self, fake_conn):
module_spec = isc.config.module_spec_from_file(self.spec_file("spec2.spec"))
diff --git a/src/lib/python/isc/config/tests/cfgmgr_test.py b/src/lib/python/isc/config/tests/cfgmgr_test.py
index 891a7d7..3f620b8 100644
--- a/src/lib/python/isc/config/tests/cfgmgr_test.py
+++ b/src/lib/python/isc/config/tests/cfgmgr_test.py
@@ -36,7 +36,7 @@ class TestConfigManagerData(unittest.TestCase):
Test what happens if we give the config manager an absolute path.
It shouldn't append the data path to it.
"""
- abs_path = self.data_path + os.sep + "b10-config-imaginary.db"
+ abs_path = self.data_path + '/' + "b10-config-imaginary.db"
data = ConfigManagerData(self.data_path, abs_path)
self.assertEqual(abs_path, data.db_filename)
self.assertEqual(self.data_path, data.data_path)
@@ -47,7 +47,7 @@ class TestConfigManagerData(unittest.TestCase):
self.assertEqual(self.config_manager_data.data_path,
self.writable_data_path)
self.assertEqual(self.config_manager_data.db_filename,
- self.writable_data_path + os.sep + "b10-config.db")
+ self.writable_data_path + '/' + "b10-config.db")
def test_read_from_file(self):
ConfigManagerData.read_from_file(self.writable_data_path, "b10-config.db")
@@ -154,7 +154,7 @@ class TestConfigManager(unittest.TestCase):
database_filename="b10-config.db",
session=self.fake_session)
self.name = "TestModule"
- self.spec = isc.config.module_spec_from_file(self.data_path + os.sep + "/spec2.spec")
+ self.spec = isc.config.module_spec_from_file(self.data_path + '/' + "/spec2.spec")
def test_paths(self):
"""
@@ -162,11 +162,11 @@ class TestConfigManager(unittest.TestCase):
underlying ConfigManagerData.
"""
cm = ConfigManager("datapath", "filename", self.fake_session)
- self.assertEqual("datapath" + os.sep + "filename",
+ self.assertEqual("datapath" + '/' + "filename",
cm.config.db_filename)
# It should preserve it while reading
cm.read_config()
- self.assertEqual("datapath" + os.sep + "filename",
+ self.assertEqual("datapath" + '/' + "filename",
cm.config.db_filename)
def test_init(self):
@@ -185,7 +185,7 @@ class TestConfigManager(unittest.TestCase):
self.assertEqual(msg, {"running": "ConfigManager"})
def test_set_module_spec(self):
- module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + '/' + "spec1.spec")
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
self.cm.set_module_spec(module_spec)
self.assert_(module_spec.get_module_name() in self.cm.module_specs)
@@ -193,7 +193,7 @@ class TestConfigManager(unittest.TestCase):
self.cm.virtual_modules)
def test_remove_module_spec(self):
- module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + '/' + "spec1.spec")
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
self.cm.set_module_spec(module_spec)
self.assert_(module_spec.get_module_name() in self.cm.module_specs)
@@ -204,7 +204,7 @@ class TestConfigManager(unittest.TestCase):
def test_add_remove_virtual_module(self):
module_spec = isc.config.module_spec.module_spec_from_file(
- self.data_path + os.sep + "spec1.spec")
+ self.data_path + '/' + "spec1.spec")
check_func = lambda: True
# Make sure it's not in there before
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
@@ -225,7 +225,7 @@ class TestConfigManager(unittest.TestCase):
self.cm.virtual_modules)
def test_get_module_spec(self):
- module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + '/' + "spec1.spec")
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
self.cm.set_module_spec(module_spec)
self.assert_(module_spec.get_module_name() in self.cm.module_specs)
@@ -237,14 +237,14 @@ class TestConfigManager(unittest.TestCase):
def test_get_config_spec(self):
config_spec = self.cm.get_config_spec()
self.assertEqual(config_spec, {})
- module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + '/' + "spec1.spec")
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
self.cm.set_module_spec(module_spec)
self.assert_(module_spec.get_module_name() in self.cm.module_specs)
config_spec = self.cm.get_config_spec()
self.assertEqual(config_spec, { 'Spec1': None })
self.cm.remove_module_spec('Spec1')
- module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
self.cm.set_module_spec(module_spec)
self.assert_(module_spec.get_module_name() in self.cm.module_specs)
@@ -257,14 +257,14 @@ class TestConfigManager(unittest.TestCase):
def test_get_commands_spec(self):
commands_spec = self.cm.get_commands_spec()
self.assertEqual(commands_spec, {})
- module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + '/' + "spec1.spec")
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
self.cm.set_module_spec(module_spec)
self.assert_(module_spec.get_module_name() in self.cm.module_specs)
commands_spec = self.cm.get_commands_spec()
self.assertEqual(commands_spec, { 'Spec1': None })
self.cm.remove_module_spec('Spec1')
- module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
self.cm.set_module_spec(module_spec)
self.assert_(module_spec.get_module_name() in self.cm.module_specs)
@@ -276,14 +276,14 @@ class TestConfigManager(unittest.TestCase):
def test_get_statistics_spec(self):
statistics_spec = self.cm.get_statistics_spec()
self.assertEqual(statistics_spec, {})
- module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + '/' + "spec1.spec")
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
self.cm.set_module_spec(module_spec)
self.assert_(module_spec.get_module_name() in self.cm.module_specs)
statistics_spec = self.cm.get_statistics_spec()
self.assertEqual(statistics_spec, { 'Spec1': None })
self.cm.remove_module_spec('Spec1')
- module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.assert_(module_spec.get_module_name() not in self.cm.module_specs)
self.cm.set_module_spec(module_spec)
self.assert_(module_spec.get_module_name() in self.cm.module_specs)
diff --git a/src/lib/python/isc/config/tests/config_data_test.py b/src/lib/python/isc/config/tests/config_data_test.py
index 221ffa6..496de19 100644
--- a/src/lib/python/isc/config/tests/config_data_test.py
+++ b/src/lib/python/isc/config/tests/config_data_test.py
@@ -28,18 +28,18 @@ class TestConfigData(unittest.TestCase):
self.data_path = os.environ['CONFIG_TESTDATA_PATH']
else:
self.data_path = "../../../testdata"
- spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.cd = ConfigData(spec)
#def test_module_spec_from_file(self):
- # spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ # spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec1.spec")
# cd = ConfigData(spec)
# self.assertEqual(cd.specification, spec)
# self.assertEqual(cd.data, {})
# self.assertRaises(ConfigDataError, ConfigData, 1)
def test_check_type(self):
- config_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec22.spec").get_config_spec()
+ config_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec22.spec").get_config_spec()
spec_part = find_spec_part(config_spec, "value1")
check_type(spec_part, 1)
self.assertRaises(isc.cc.data.DataTypeError, check_type, spec_part, 1.1)
@@ -94,7 +94,7 @@ class TestConfigData(unittest.TestCase):
self.assertRaises(isc.cc.data.DataTypeError, check_type, config_spec, 1)
def test_convert_type(self):
- config_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec22.spec").get_config_spec()
+ config_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec22.spec").get_config_spec()
spec_part = find_spec_part(config_spec, "value1")
self.assertEqual(1, convert_type(spec_part, '1'))
self.assertEqual(2, convert_type(spec_part, 2.1))
@@ -193,7 +193,7 @@ class TestConfigData(unittest.TestCase):
def test_find_spec_part_lists(self):
# A few specific tests for list data
module_spec = isc.config.module_spec_from_file(self.data_path +
- os.sep +
+ '/' +
"spec31.spec")
config_spec = module_spec.get_config_spec()
@@ -239,7 +239,7 @@ class TestConfigData(unittest.TestCase):
name_list = spec_name_list(spec_part, "item6", True)
self.assertEqual(['item6/value1', 'item6/value2'], name_list)
- config_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec22.spec").get_config_spec()
+ config_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec22.spec").get_config_spec()
spec_part = find_spec_part(config_spec, "value9")
name_list = spec_name_list(spec_part, "value9", True)
self.assertEqual(['value9/v91', 'value9/v92/v92a', 'value9/v92/v92b'], name_list)
@@ -344,7 +344,7 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual({}, self.mcd._local_changes)
def test_set_remove_specification(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec1.spec")
self.assertFalse(self.mcd.have_specification(module_spec.get_module_name()))
self.mcd.set_specification(module_spec)
self.assertTrue(self.mcd.have_specification(module_spec.get_module_name()))
@@ -357,7 +357,7 @@ class TestMultiConfigData(unittest.TestCase):
def test_clear_specifications(self):
self.assertEqual(0, len(self.mcd._specifications))
module_spec = isc.config.module_spec_from_file(self.data_path +
- os.sep +
+ '/' +
"spec1.spec")
self.mcd.set_specification(module_spec)
self.assertEqual(1, len(self.mcd._specifications))
@@ -365,7 +365,7 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual(0, len(self.mcd._specifications))
def test_get_module_spec(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec1.spec")
self.mcd.set_specification(module_spec)
module_spec2 = self.mcd.get_module_spec(module_spec.get_module_name())
self.assertEqual(module_spec, module_spec2)
@@ -377,13 +377,13 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual(None, spec_part)
spec_part = self.mcd.find_spec_part("/Spec2/item1")
self.assertEqual(None, spec_part)
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
spec_part = self.mcd.find_spec_part("Spec2/item1")
self.assertEqual({'item_name': 'item1', 'item_type': 'integer', 'item_optional': False, 'item_default': 1, }, spec_part)
def test_find_spec_part_nested(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec30.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec30.spec")
self.mcd.set_specification(module_spec)
spec_part = self.mcd.find_spec_part("/lists/first_list_items[0]/second_list_items[1]/final_element")
self.assertEqual({'item_name': 'final_element', 'item_type': 'string', 'item_default': 'hello', 'item_optional': False}, spec_part)
@@ -391,7 +391,7 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual(None, spec_part)
def test_find_spec_part_nested2(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec31.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec31.spec")
self.mcd.set_specification(module_spec)
spec_part = self.mcd.find_spec_part("/lists/first_list_items[0]/second_list_items[1]/map_element/list1[1]/list2[2]")
self.assertEqual({"item_name": "number", "item_type": "integer", "item_optional": False, "item_default": 1}, spec_part)
@@ -417,7 +417,7 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual(cf, self.mcd.get_current_config())
def test_get_local_changes(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
local_changes = self.mcd.get_local_changes()
self.assertEqual({}, local_changes)
@@ -426,7 +426,7 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual({"Spec2": { "item1": 2}}, local_changes)
def test_set_local_changes(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
self.assertEqual({}, self.mcd.get_local_changes())
new_local_changes = {"Spec2": { "item1": 2}}
@@ -434,7 +434,7 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual(new_local_changes, self.mcd.get_local_changes())
def test_clear_local_changes(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
self.mcd.set_value("Spec2/item1", 2)
self.mcd.clear_local_changes()
@@ -443,7 +443,7 @@ class TestMultiConfigData(unittest.TestCase):
pass
def test_get_local_value(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
value = self.mcd.get_local_value("Spec2/item1")
self.assertEqual(None, value)
@@ -460,7 +460,7 @@ class TestMultiConfigData(unittest.TestCase):
pass
def test_get_default_value(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
value = self.mcd.get_default_value("Spec2/item1")
self.assertEqual(1, value)
@@ -481,7 +481,7 @@ class TestMultiConfigData(unittest.TestCase):
value = self.mcd.get_default_value("Spec2/no_such_item/asdf")
self.assertEqual(None, value)
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec32.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec32.spec")
self.mcd.set_specification(module_spec)
value = self.mcd.get_default_value("Spec32/named_set_item")
self.assertEqual({ 'a': 1, 'b': 2}, value)
@@ -493,7 +493,7 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual(None, value)
def test_get_value(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
self.mcd.set_value("Spec2/item1", 2)
@@ -536,7 +536,7 @@ class TestMultiConfigData(unittest.TestCase):
maps = self.mcd.get_value_maps()
self.assertEqual([], maps)
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec1.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec1.spec")
self.mcd.set_specification(module_spec)
expected = [{'default': False,
@@ -558,7 +558,7 @@ class TestMultiConfigData(unittest.TestCase):
self.mcd.remove_specification("Spec1")
self.mcd.remove_specification("foo")
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
maps = self.mcd.get_value_maps()
self.assertEqual([{'default': False, 'type': 'module', 'name': 'Spec2', 'value': None, 'modified': False}], maps)
@@ -594,7 +594,7 @@ class TestMultiConfigData(unittest.TestCase):
maps = self.mcd.get_value_maps("/Spec2/item4")
self.assertEqual([{'default': True, 'type': 'string', 'name': 'Spec2/item4', 'value': 'test', 'modified': False}], maps)
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec24.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec24.spec")
self.mcd.set_specification(module_spec)
# optional list item that is not set should return as empty list
maps = self.mcd.get_value_maps("/Spec24/item", 4)
@@ -604,7 +604,7 @@ class TestMultiConfigData(unittest.TestCase):
maps = self.mcd.get_value_maps("/Spec24/item")
self.assertEqual([{'default': False, 'modified': False, 'name': 'Spec24/item', 'type': 'list', 'value': []}], maps)
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec22.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec22.spec")
self.mcd.set_specification(module_spec)
expected = [{'default': True,
'modified': False,
@@ -642,7 +642,7 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual(expected2, maps)
def test_get_value_maps_named_set(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec32.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec32.spec")
self.mcd.set_specification(module_spec)
maps = self.mcd.get_value_maps()
self.assertEqual([{'default': False, 'type': 'module',
@@ -665,7 +665,7 @@ class TestMultiConfigData(unittest.TestCase):
'value': 2, 'modified': False}], maps)
def test_set_value(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
self.mcd.set_value("Spec2/item1", 2)
self.assertRaises(isc.cc.data.DataTypeError,
@@ -686,7 +686,7 @@ class TestMultiConfigData(unittest.TestCase):
"""
Test the unset command works.
"""
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
self.mcd.set_specification(module_spec)
value, status = self.mcd.get_value("Spec2/item1")
@@ -716,7 +716,7 @@ class TestMultiConfigData(unittest.TestCase):
def test_get_config_item_list(self):
config_items = self.mcd.get_config_item_list()
self.assertEqual([], config_items)
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec2.spec")
self.mcd.set_specification(module_spec)
config_items = self.mcd.get_config_item_list()
self.assertEqual(['Spec2'], config_items)
@@ -734,7 +734,7 @@ class TestMultiConfigData(unittest.TestCase):
self.assertEqual(['Spec2/item1', 'Spec2/item2', 'Spec2/item3', 'Spec2/item4', 'Spec2/item5', 'Spec2/item6/value1', 'Spec2/item6/value2'], config_items)
def test_is_named_set(self):
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec32.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec32.spec")
self.mcd.set_specification(module_spec)
spec_part = self.mcd.find_spec_part("Spec32/named_set_item")
self.assertTrue(spec_part_is_named_set(spec_part))
@@ -742,7 +742,7 @@ class TestMultiConfigData(unittest.TestCase):
def test_get_config_item_list_named_set(self):
config_items = self.mcd.get_config_item_list()
self.assertEqual([], config_items)
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec32.spec")
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + "spec32.spec")
self.mcd.set_specification(module_spec)
config_items = self.mcd.get_config_item_list()
self.assertEqual(['Spec32'], config_items)
@@ -760,7 +760,7 @@ class TestMultiConfigData(unittest.TestCase):
def test_set_named_set_nonlocal(self):
# Test whether a default named set is copied to local if a subitem
# is changed, and that other items in the set do not get lost
- module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + 'spec32.spec')
+ module_spec = isc.config.module_spec_from_file(self.data_path + '/' + 'spec32.spec')
self.mcd.set_specification(module_spec)
value, status = self.mcd.get_value('Spec32/named_set_item')
self.assertEqual({'a': 1, 'b': 2}, value)
diff --git a/src/lib/python/isc/config/tests/module_spec_test.py b/src/lib/python/isc/config/tests/module_spec_test.py
index bb2bcda..4717d9c 100644
--- a/src/lib/python/isc/config/tests/module_spec_test.py
+++ b/src/lib/python/isc/config/tests/module_spec_test.py
@@ -31,7 +31,7 @@ class TestModuleSpec(unittest.TestCase):
self.data_path = "../../../testdata"
def spec_file(self, filename):
- return(self.data_path + os.sep + filename)
+ return(self.data_path + '/' + filename)
def read_spec_file(self, filename):
return isc.config.module_spec_from_file(self.spec_file(filename))
diff --git a/src/lib/python/isc/datasrc/tests/datasrc_test.py b/src/lib/python/isc/datasrc/tests/datasrc_test.py
index 74f822f..f02be2a 100644
--- a/src/lib/python/isc/datasrc/tests/datasrc_test.py
+++ b/src/lib/python/isc/datasrc/tests/datasrc_test.py
@@ -25,8 +25,8 @@ import shutil
import sys
import json
-TESTDATA_PATH = os.environ['TESTDATA_PATH'] + os.sep
-TESTDATA_WRITE_PATH = os.environ['TESTDATA_WRITE_PATH'] + os.sep
+TESTDATA_PATH = os.environ['TESTDATA_PATH'] + '/'
+TESTDATA_WRITE_PATH = os.environ['TESTDATA_WRITE_PATH'] + '/'
READ_ZONE_DB_FILE = TESTDATA_PATH + "example.com.sqlite3"
WRITE_ZONE_DB_FILE = TESTDATA_WRITE_PATH + "rwtest.sqlite3.copied"
diff --git a/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py b/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py
index 5604c32..b4f43ec 100644
--- a/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py
+++ b/src/lib/python/isc/datasrc/tests/sqlite3_ds_test.py
@@ -19,8 +19,8 @@ import socket
import unittest
import sqlite3
-TESTDATA_PATH = os.environ['TESTDATA_PATH'] + os.sep
-TESTDATA_WRITE_PATH = os.environ['TESTDATA_WRITE_PATH'] + os.sep
+TESTDATA_PATH = os.environ['TESTDATA_PATH'] + '/'
+TESTDATA_WRITE_PATH = os.environ['TESTDATA_WRITE_PATH'] + '/'
DBFILE_NEWSCHEMA = TESTDATA_PATH + "/newschema.sqlite3";
DBFILE_OLDSCHEMA = TESTDATA_PATH + "/oldschema.sqlite3";
diff --git a/src/lib/python/isc/ddns/tests/session_tests.py b/src/lib/python/isc/ddns/tests/session_tests.py
index f7c2d3c..5678128 100644
--- a/src/lib/python/isc/ddns/tests/session_tests.py
+++ b/src/lib/python/isc/ddns/tests/session_tests.py
@@ -23,9 +23,9 @@ from isc.ddns.session import *
from isc.ddns.zone_config import *
# Some common test parameters
-TESTDATA_PATH = os.environ['TESTDATA_PATH'] + os.sep
+TESTDATA_PATH = os.environ['TESTDATA_PATH'] + '/'
READ_ZONE_DB_FILE = TESTDATA_PATH + "rwtest.sqlite3" # original, to be copied
-TESTDATA_WRITE_PATH = os.environ['TESTDATA_WRITE_PATH'] + os.sep
+TESTDATA_WRITE_PATH = os.environ['TESTDATA_WRITE_PATH'] + '/'
WRITE_ZONE_DB_FILE = TESTDATA_WRITE_PATH + "rwtest.sqlite3.copied"
WRITE_ZONE_DB_CONFIG = "{ \"database_file\": \"" + WRITE_ZONE_DB_FILE + "\"}"
diff --git a/src/lib/python/isc/log/tests/check_output-win32.sh b/src/lib/python/isc/log/tests/check_output-win32.sh
index d718e4a..cdb3133 100755
--- a/src/lib/python/isc/log/tests/check_output-win32.sh
+++ b/src/lib/python/isc/log/tests/check_output-win32.sh
@@ -1,3 +1,4 @@
#!/bin/sh
-${PYTHON} "$1" 2>&1 | cut -d\ -f3- | diff -b - "$2" 1>&2
+${PYTHON} "$1" 2>&1 | egrep -v '^\[[0-9]+ refs\]$' |\
+ cut -d\ -f3- | diff -b - "$2" 1>&2
diff --git a/src/lib/python/isc/notify/notify_out.py b/src/lib/python/isc/notify/notify_out.py
index c098daa..b1aebbd 100644
--- a/src/lib/python/isc/notify/notify_out.py
+++ b/src/lib/python/isc/notify/notify_out.py
@@ -133,7 +133,7 @@ class NotifyOut:
self._waiting_zones = []
self._notifying_zones = []
self._serving = False
- self._read_sock, self._write_sock = socketpair.socketpair()
+ self._read_sock, self._write_sock = socketpair()
self._read_sock.setblocking(False)
self.notify_num = 0 # the count of in progress notifies
self._verbose = verbose
diff --git a/src/lib/python/isc/notify/tests/notify_out_test.py b/src/lib/python/isc/notify/tests/notify_out_test.py
index d3b57da..c3ab60b 100644
--- a/src/lib/python/isc/notify/tests/notify_out_test.py
+++ b/src/lib/python/isc/notify/tests/notify_out_test.py
@@ -29,7 +29,7 @@ TESTDATA_SRCDIR = os.getenv("TESTDATASRCDIR")
# our fake socket, where we can read and insert messages
class MockSocket():
def __init__(self):
- self._local_sock, self._remote_sock = socketpair.socketpair()
+ self._local_sock, self._remote_sock = socketpair()
def connect(self, to):
pass
@@ -201,8 +201,7 @@ class TestNotifyOut(unittest.TestCase):
self._notify._read_sock.close()
if self._notify._write_sock is not None:
self._notify._write_sock.close()
- self._notify._read_sock, self._notify._write_sock = \
- socketpair.socketpair()
+ self._notify._read_sock, self._notify._write_sock = socketpair()
self._notify._write_sock.send(SOCK_DATA)
replied_zones, timeout_zones = self._notify._wait_for_notify_reply()
self.assertEqual(0, len(replied_zones))
diff --git a/src/lib/python/isc/util/socketpair.py b/src/lib/python/isc/util/socketpair.py
index e12d971..342cb0a 100644
--- a/src/lib/python/isc/util/socketpair.py
+++ b/src/lib/python/isc/util/socketpair.py
@@ -28,10 +28,10 @@ def socketpair(family=pairfamily, type_=socket.SOCK_STREAM, proto=0):
try:
sock1, sock2 = socket.socketpair(family, type_, proto)
return (sock1, sock2)
- except NameError:
+ except AttributeError:
# get passive socket
psock = socket.socket(family, type_, proto)
- psock.setsocketop(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+ psock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
psock.bind(('127.0.0.1', 0))
intf, port = psock.getsockname()
psock.listen(1)
diff --git a/src/lib/python/isc/util/socketserver_mixin.py b/src/lib/python/isc/util/socketserver_mixin.py
index 0934b75..08797e6 100644
--- a/src/lib/python/isc/util/socketserver_mixin.py
+++ b/src/lib/python/isc/util/socketserver_mixin.py
@@ -54,7 +54,7 @@ class NoPollMixIn:
some other thread.
'''
def __init__(self):
- self.__read_sock, self.__write_sock = socketpair.socketpair()
+ self.__read_sock, self.__write_sock = socketpair()
self._is_shut_down = threading.Event()
def serve_forever(self, poll_interval=None):
diff --git a/win32build/VS2010/pyunittests_util/pyunittests_util.vcxproj b/win32build/VS2010/pyunittests_util/pyunittests_util.vcxproj
index 83f520a..2e80694 100755
--- a/win32build/VS2010/pyunittests_util/pyunittests_util.vcxproj
+++ b/win32build/VS2010/pyunittests_util/pyunittests_util.vcxproj
@@ -62,7 +62,7 @@
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <OutputFile>$(OutDir)pyunittests_util.pyd</OutputFile>
+ <OutputFile>$(OutDir)pyunittests_util_d.pyd</OutputFile>
<AdditionalLibraryDirectories>..\$(Configuration);C:\Python32\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>libb10-util.lib;python32_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
diff --git a/win32build/check/datasrc-debug b/win32build/check/datasrc-debug
index bff4383..e8aca64 100755
--- a/win32build/check/datasrc-debug
+++ b/win32build/check/datasrc-debug
@@ -4,11 +4,11 @@ echo datasrc-tests / Debug
echo
${BIND10HOME}/win32build/${VSVER}/datasrc-tests/Debug/run_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
# memory
echo datasrc-factory-tests / Debug
${BIND10HOME}/win32build/${VSVER}/datasrc-ftests/Debug/run_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
diff --git a/win32build/check/datasrc-release b/win32build/check/datasrc-release
index f02622e..6647095 100755
--- a/win32build/check/datasrc-release
+++ b/win32build/check/datasrc-release
@@ -4,11 +4,11 @@ echo datasrc-tests / Release
echo
${BIND10HOME}/win32build/${VSVER}/datasrc-tests/Release/run_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
# memory
echo datasrc-factory-tests / Release
${BIND10HOME}/win32build/${VSVER}/datasrc-ftests/Release/run_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
diff --git a/win32build/check/dhcp6-debug b/win32build/check/dhcp6-debug
index cbf0d47..88d2074 100755
--- a/win32build/check/dhcp6-debug
+++ b/win32build/check/dhcp6-debug
@@ -5,7 +5,7 @@ echo
exit 0
${BIND10HOME}/win32build/${VSVER}/dhcp6-tests/Debug/dhcp6_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
if [ ${PYTHON} == "None" ]; then
echo skipping dhcp6 python / Debug
@@ -22,6 +22,6 @@ PYTESTS='dhcp6_test.py'
# echo ${pytest}
# ${PYTHON} ${BIND10HOME}/src/bin/dhcp6/tests/${pytest}
# if test $? -ne 0; then
-# exit $?
+# exit -1
# fi
# done
diff --git a/win32build/check/dhcp6-release b/win32build/check/dhcp6-release
index 48b44b3..27b24c2 100755
--- a/win32build/check/dhcp6-release
+++ b/win32build/check/dhcp6-release
@@ -5,7 +5,7 @@ echo
exit 0
${BIND10HOME}/win32build/${VSVER}/dhcp6-tests/Release/dhcp6_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
if [ ${PYTHON} == "None" ]; then
echo skipping dhcp6 python / Release
@@ -22,6 +22,6 @@ PYTESTS='dhcp6_test.py'
# echo ${pytest}
# ${PYTHON} ${BIND10HOME}/src/bin/dhcp6/tests/${pytest}
# if test $? -ne 0; then
-# exit $?
+# exit -1
# fi
# done
diff --git a/win32build/check/dns++-debug b/win32build/check/dns++-debug
index 89ac330..2c324b3 100755
--- a/win32build/check/dns++-debug
+++ b/win32build/check/dns++-debug
@@ -4,7 +4,7 @@ echo dns++-tests / Debug
echo
${BIND10HOME}/win32build/${VSVER}/dns++-tests/Debug/run_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
if [ ${PYTHON} == "None" ]; then
echo skipping dns python / Debug
@@ -36,6 +36,6 @@ for pytest in ${PYTESTS}
echo ${pytest}
${PYTHON} ${BIND10HOME}/src/lib/dns/python/tests/${pytest}
if test $? -ne 0; then
- exit $?
+ exit -1
fi
done
diff --git a/win32build/check/dns++-release b/win32build/check/dns++-release
index fe8f882..9eb1c34 100755
--- a/win32build/check/dns++-release
+++ b/win32build/check/dns++-release
@@ -4,7 +4,7 @@ echo dns++-tests / Release
echo
${BIND10HOME}/win32build/${VSVER}/dns++-tests/Release/run_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
if [ ${PYTHON} == "None" ]; then
echo skipping dns python / Release
@@ -36,6 +36,6 @@ for pytest in ${PYTESTS}
echo ${pytest}
${PYTHON} ${BIND10HOME}/src/lib/dns/python/tests/${pytest}
if test $? -ne 0; then
- exit $?
+ exit -1
fi
done
diff --git a/win32build/check/log-debug b/win32build/check/log-debug
index 589da36..8d8cb59 100755
--- a/win32build/check/log-debug
+++ b/win32build/check/log-debug
@@ -4,41 +4,41 @@ echo log-tests / Debug
echo
${BIND10HOME}/win32build/${VSVER}/log-tests/Debug/run_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo console / Debug
(cd ${BIND10HOME}/win32build/${VSVER}/log-example/Debug;
${BIND10HOME}/src/lib/log/tests/console_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo destination / Debug
(cd ${BIND10HOME}/win32build/${VSVER}/log-example/Debug;
${BIND10HOME}/src/lib/log/tests/destination_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo init logger / Debug
(cd ${BIND10HOME}/win32build/${VSVER}/log-iltest/Debug;
${BIND10HOME}/src/lib/log/tests/init_logger_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo local file / Debug
(cd ${BIND10HOME}/win32build/${VSVER}/log-example/Debug;
${BIND10HOME}/src/lib/log/tests/local_file_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo logger lock / Debug
(cd ${BIND10HOME}/win32build/${VSVER}/log-lltest/Debug;
${BIND10HOME}/src/lib/log/tests/logger_lock_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo severity / Debug
(cd ${BIND10HOME}/win32build/${VSVER}/log-example/Debug;
${BIND10HOME}/src/lib/log/tests/local_file_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
diff --git a/win32build/check/log-release b/win32build/check/log-release
index 87fd1b9..b65b8d6 100755
--- a/win32build/check/log-release
+++ b/win32build/check/log-release
@@ -4,41 +4,41 @@ echo log-tests / Release
echo
${BIND10HOME}/win32build/${VSVER}/log-tests/Release/run_unittests.exe
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo console / Release
(cd ${BIND10HOME}/win32build/${VSVER}/log-example/Release;
${BIND10HOME}/src/lib/log/tests/console_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo destination / Release
(cd ${BIND10HOME}/win32build/${VSVER}/log-example/Release;
${BIND10HOME}/src/lib/log/tests/destination_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo init logger / Release
(cd ${BIND10HOME}/win32build/${VSVER}/log-iltest/Release;
${BIND10HOME}/src/lib/log/tests/init_logger_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo local file / Release
(cd ${BIND10HOME}/win32build/${VSVER}/log-example/Release;
${BIND10HOME}/src/lib/log/tests/local_file_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo logger lock / Release
(cd ${BIND10HOME}/win32build/${VSVER}/log-lltest/Release;
${BIND10HOME}/src/lib/log/tests/logger_lock_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
echo severity / Release
(cd ${BIND10HOME}/win32build/${VSVER}/log-example/Release;
${BIND10HOME}/src/lib/log/tests/local_file_test.sh)
if test $? -ne 0; then
- exit $?
+ exit -1
fi
diff --git a/win32build/check/python-debug b/win32build/check/python-debug
index 90f8c41..abb3876 100755
--- a/win32build/check/python-debug
+++ b/win32build/check/python-debug
@@ -22,41 +22,43 @@ for pytest in ${PYTESTS}
echo ${pytest}
${PYTHON} ${BIND10HOME}/src/lib/python/isc/datasrc/tests/${pytest}
if test $? -ne 0; then
- exit $?
+ exit -1
fi
done
-echo skipping python cc / Debug
+echo partial python cc / Debug
export PYTHONPATH=${CPYTHONPATH}
#export BIND10_TEST_SOCKET_FILE=
-PYTESTS='message_test.py data_test.py session_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/cc/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+#PYTESTS='message_test.py data_test.py session_test.py'
+PYTESTS='message_test.py data_test.py'
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/cc/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python config / Debug
+echo partial python config / Debug
export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/config"
export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
export B10_TEST_PLUGIN_DIR=${BIND10HOME}/src/bin/cfgmgr/plugins
-export CONFIG_TESTDATA_PATH=${CTESTDATA}
-export CONFIG_WR_TESTDATA_PATH=${CTESTDATA}
-PYTESTS='ccsession_test.py
- cfgmgr_test.py
- config_data_test.py
- module_spec_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/config/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+export CONFIG_TESTDATA_PATH=${BIND10HOME}/src/lib/config/tests/testdata
+export CONFIG_WR_TESTDATA_PATH=${BIND10HOME}/src/lib/config/tests/testdata
+#PYTESTS='ccsession_test.py
+# cfgmgr_test.py
+# config_data_test.py
+# module_spec_test.py'
+PYTESTS='config_data_test.py module_spec_test.py'
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/config/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
echo python log / Debug
export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/log"
@@ -67,7 +69,7 @@ export CONFIG_WR_TESTDATA_PATH=${CTESTDATA}
BDIR=${BIND10HOME}/src/lib/python/isc/log/tests
${BDIR}/check_output-win32.sh ${BDIR}/log_console.py ${BDIR}/console.out
if test $? -ne 0; then
- exit $?
+ exit -1
fi
PYTESTS='log_test.py log_console.py'
for pytest in ${PYTESTS}
@@ -75,34 +77,34 @@ for pytest in ${PYTESTS}
echo ${pytest}
${PYTHON} ${BIND10HOME}/src/lib/python/isc/log/tests/${pytest}
if test $? -ne 0; then
- exit $?
+ exit -1
fi
done
-echo skipping python net / Debug
+echo python net / Debug
export PYTHONPATH=${CPYTHONPATH}
PYTESTS='addr_test.py parse_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/net/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/net/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python notify / Debug
+echo python notify / Debug
export PYTHONPATH=${CPYTHONPATH}
export TESTDATASRCDIR=${BIND10HOME}/src/lib/python/isc/notify/tests/testdata/
PYTESTS='notify_out_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/notify/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/notify/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
echo skipping python util cio / Debug
export PYTHONPATH=${CPYTHONPATH}
@@ -113,21 +115,22 @@ PYTESTS='socketsession_test.py'
# echo ${pytest}
# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/cio/tests/${pytest}
# if test $? -ne 0; then
-# exit $?
+# exit -1
# fi
# done
-echo skipping python util / Debug
+echo partial python util / Debug
export PYTHONPATH=${CPYTHONPATH}
-PYTESTS='process_test.py socketserver_mixin_test.py file_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+#PYTESTS='process_test.py socketserver_mixin_test.py file_test.py'
+PYTESTS='process_test.py socketserver_mixin_test.py'
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
echo python acl / Debug
export PYTHONPATH=${CPYTHONPATH}
@@ -137,7 +140,7 @@ for pytest in ${PYTESTS}
echo ${pytest}
${PYTHON} ${BIND10HOME}/src/lib/python/isc/acl/tests/${pytest}
if test $? -ne 0; then
- exit $?
+ exit -1
fi
done
@@ -152,60 +155,60 @@ PYTESTS='sockcreator_test.py component_test.py socket_cache_test.py'
# echo ${pytest}
# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/bind10/tests/${pytest}
# if test $? -ne 0; then
-# exit $?
+# exit -1
# fi
# done
-echo skipping python xfrin / Debug
+echo python xfrin / Debug
export PYTHONPATH=${CPYTHONPATH}
export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
PYTESTS='diff_tests.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/xfrin/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/xfrin/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python server-common / Debug
+echo python server-common / Debug
export PYTHONPATH=${CPYTHONPATH}
export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
PYTESTS='tsig_keyring_test.py dns_tcp_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} \
-# ${BIND10HOME}/src/lib/python/isc/server_common/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} \
+ ${BIND10HOME}/src/lib/python/isc/server_common/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python ddns / Debug
+echo python ddns / Debug
export PYTHONPATH=${CPYTHONPATH}
-export TESTDATA_PATH=${CTESTDATA}
+export TESTDATA_PATH=${BIND10HOME}/src/lib/testutils/testdata
export TESTDATA_WRITE_PATH=${BIND10HOME}/src/lib/python/isc/ddns/tests
PYTESTS='session_tests.py zone_config_tests.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/ddns/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/ddns/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python sysinfo / Debug
+echo python sysinfo / Debug
export PYTHONPATH=${CPYTHONPATH}
PYTESTS='sysinfo_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/sysinfo/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/sysinfo/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
diff --git a/win32build/check/python-release b/win32build/check/python-release
index 601c4e2..4a45bbf 100755
--- a/win32build/check/python-release
+++ b/win32build/check/python-release
@@ -22,41 +22,43 @@ for pytest in ${PYTESTS}
echo ${pytest}
${PYTHON} ${BIND10HOME}/src/lib/python/isc/datasrc/tests/${pytest}
if test $? -ne 0; then
- exit $?
+ exit -1
fi
done
-echo skipping python cc / Release
+echo partial python cc / Release
export PYTHONPATH=${CPYTHONPATH}
#export BIND10_TEST_SOCKET_FILE=
-PYTESTS='message_test.py data_test.py session_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/cc/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+#PYTESTS='message_test.py data_test.py session_test.py'
+PYTESTS='message_test.py data_test.py'
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/cc/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python config / Release
+echo partial python config / Release
export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/config"
export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
export B10_TEST_PLUGIN_DIR=${BIND10HOME}/src/bin/cfgmgr/plugins
-export CONFIG_TESTDATA_PATH=${CTESTDATA}
-export CONFIG_WR_TESTDATA_PATH=${CTESTDATA}
-PYTESTS='ccsession_test.py
- cfgmgr_test.py
- config_data_test.py
- module_spec_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/config/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+export CONFIG_TESTDATA_PATH=${BIND10HOME}/src/lib/config/tests/testdata
+export CONFIG_WR_TESTDATA_PATH=${BIND10HOME}/src/lib/config/tests/testdata
+#PYTESTS='ccsession_test.py
+# cfgmgr_test.py
+# config_data_test.py
+# module_spec_test.py'
+PYTESTS='config_data_test.py module_spec_test.py'
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/config/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
echo python log / Release
export PYTHONPATH="${CPYTHONPATH};${BIND10HOME}/src/lib/python/isc/log"
@@ -67,7 +69,7 @@ export CONFIG_WR_TESTDATA_PATH=${CTESTDATA}
BDIR=${BIND10HOME}/src/lib/python/isc/log/tests
${BDIR}/check_output-win32.sh ${BDIR}/log_console.py ${BDIR}/console.out
if test $? -ne 0; then
- exit $?
+ exit -1
fi
PYTESTS='log_test.py log_console.py'
for pytest in ${PYTESTS}
@@ -75,34 +77,34 @@ for pytest in ${PYTESTS}
echo ${pytest}
${PYTHON} ${BIND10HOME}/src/lib/python/isc/log/tests/${pytest}
if test $? -ne 0; then
- exit $?
+ exit -1
fi
done
-echo skipping python net / Release
+echo python net / Release
export PYTHONPATH=${CPYTHONPATH}
PYTESTS='addr_test.py parse_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/net/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/net/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python notify / Release
+echo python notify / Release
export PYTHONPATH=${CPYTHONPATH}
export TESTDATASRCDIR=${BIND10HOME}/src/lib/python/isc/notify/tests/testdata/
PYTESTS='notify_out_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/notify/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/notify/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
echo skipping python util cio / Release
export PYTHONPATH=${CPYTHONPATH}
@@ -113,21 +115,22 @@ PYTESTS='socketsession_test.py'
# echo ${pytest}
# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/cio/tests/${pytest}
# if test $? -ne 0; then
-# exit $?
+# exit -1
# fi
# done
-echo skipping python util / Release
+echo partial python util / Release
export PYTHONPATH=${CPYTHONPATH}
-PYTESTS='process_test.py socketserver_mixin_test.py file_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+#PYTESTS='process_test.py socketserver_mixin_test.py file_test.py'
+PYTESTS='process_test.py socketserver_mixin_test.py'
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/util/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
echo python acl / Release
export PYTHONPATH=${CPYTHONPATH}
@@ -137,7 +140,7 @@ for pytest in ${PYTESTS}
echo ${pytest}
${PYTHON} ${BIND10HOME}/src/lib/python/isc/acl/tests/${pytest}
if test $? -ne 0; then
- exit $?
+ exit -1
fi
done
@@ -152,60 +155,60 @@ PYTESTS='sockcreator_test.py component_test.py socket_cache_test.py'
# echo ${pytest}
# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/bind10/tests/${pytest}
# if test $? -ne 0; then
-# exit $?
+# exit -1
# fi
# done
-echo skipping python xfrin / Release
+echo python xfrin / Release
export PYTHONPATH=${CPYTHONPATH}
export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
PYTESTS='diff_tests.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/xfrin/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/xfrin/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python server-common / Release
+echo python server-common / Release
export PYTHONPATH=${CPYTHONPATH}
export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
PYTESTS='tsig_keyring_test.py dns_tcp_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} \
-# ${BIND10HOME}/src/lib/python/isc/server_common/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} \
+ ${BIND10HOME}/src/lib/python/isc/server_common/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python ddns / Release
+echo python ddns / Release
export PYTHONPATH=${CPYTHONPATH}
-export TESTDATA_PATH=${CTESTDATA}
+export TESTDATA_PATH=${BIND10HOME}/src/lib/testutils/testdata
export TESTDATA_WRITE_PATH=${BIND10HOME}/src/lib/python/isc/ddns/tests
PYTESTS='session_tests.py zone_config_tests.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/ddns/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/ddns/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
-echo skipping python sysinfo / Release
+echo python sysinfo / Release
export PYTHONPATH=${CPYTHONPATH}
PYTESTS='sysinfo_test.py'
-#for pytest in ${PYTESTS}
-# do
-# echo ${pytest}
-# ${PYTHON} ${BIND10HOME}/src/lib/python/isc/sysinfo/tests/${pytest}
-# if test $? -ne 0; then
-# exit $?
-# fi
-# done
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/lib/python/isc/sysinfo/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
More information about the bind10-changes
mailing list