[1292_2] addressed rest of comments

src/bin/bind10/bind10_src.py.in

@@ -628,18 +628,6 @@ class BoB:
         # ... and start
         return self.start_process("b10-resolver", resargs, self.c_channel_env)
 
-    def start_xfrout(self, c_channel_env):
-        self.start_simple("b10-xfrout", c_channel_env)
-
-    def start_xfrin(self, c_channel_env):
-        self.start_simple("b10-xfrin", c_channel_env)
-
-    def start_zonemgr(self, c_channel_env):
-        self.start_simple("b10-zonemgr", c_channel_env)
-
-    def start_stats(self, c_channel_env):
-        self.start_simple("b10-stats", c_channel_env)
-
     def start_cmdctl(self):
         """
             Starts the command control process

src/lib/datasrc/factory.cc

@@ -38,14 +38,14 @@ namespace {
 // Returns the resulting string to use with LibraryContainer.
 const std::string
 getDataSourceLibFile(const std::string& type) {
-    std::string lib_file = type;
-    if (type.length() == 0) {
+    if (type.empty()) {
         isc_throw(DataSourceError,
                   "DataSourceClient container called with empty type value");
     }
 
     // Type can be either a short name, in which case we need to
     // append "_ds.so", or it can be a direct .so module.
+    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()) {
         lib_file.append("_ds.so");

src/lib/datasrc/tests/Makefile.am

@@ -55,13 +55,6 @@ run_unittests_SOURCES += test_datasrc.h test_datasrc.cc
 run_unittests_SOURCES += rbtree_unittest.cc
 run_unittests_SOURCES += logger_unittest.cc
 run_unittests_SOURCES += client_unittest.cc
-if !USE_STATIC_LINK
-# This test uses dynamically loadable module.  It will cause various
-# troubles with static link such as "missing" symbols in the static object
-# for the module.  As a workaround we disable this particualr test
-# in this case.
-#run_unittests_SOURCES += factory_unittest.cc
-endif
 
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)
@@ -116,6 +109,7 @@ EXTRA_DIST += testdata/diffs.sqlite3
 # directory. Therefore we build it into a separate binary,
 # and call that from check-local with B10_FROM_BUILD set.
 # Also, we only want to do this when static building is not used.
+if !USE_STATIC_LINK
 noinst_PROGRAMS+=run_unittests_factory
 run_unittests_factory_SOURCES = $(common_sources)
 run_unittests_factory_SOURCES += factory_unittest.cc
@@ -124,3 +118,4 @@ run_unittests_factory_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)
 run_unittests_factory_LDADD = $(common_ldadd)
 check-local:
 	B10_FROM_BUILD=${abs_top_builddir} ./run_unittests_factory
+endif

tests/lettuce/features/terrain/bind10_control.py

@@ -137,8 +137,8 @@ def send_command(step, command, cmdctl_port):
                                subprocess.PIPE, None)
     bindctl.stdin.write(command + "\n")
     bindctl.stdin.write("quit\n")
-    result = bindctl.wait()
     (stdout, stderr) = bindctl.communicate()
+    result = bindctl.returncode
     assert result == 0, "bindctl exit code: " + str(result) +\
                         "\nstdout:\n" + str(stdout) +\
                         "stderr:\n" + str(stderr)