[2136] Changes regarding the test config file

- moved b10-config_test.db from src/bin/stats/tests to
  src/bin/stats/tests/testdata

- renamed its name to b10-config.db

- changed its format to multiline

These changes are due to the reviewer's comment.

diff --git a/configure.ac b/configure.ac
index af350a8997445a54e562f40858e5dc8d352a750a..8f324cab2c24a9bd8b797621d1334ffbd9bc9a52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1039,6 +1039,7 @@ AC_CONFIG_FILES([Makefile
                  src/bin/zonemgr/tests/Makefile
                  src/bin/stats/Makefile
                  src/bin/stats/tests/Makefile
+                 src/bin/stats/tests/testdata/Makefile
                  src/bin/usermgr/Makefile
                  src/bin/tests/Makefile
                  src/lib/Makefile

diff --git a/src/bin/stats/tests/Makefile.am b/src/bin/stats/tests/Makefile.am
index de184b36e961b0de599e8726e33229093bfc844d..7484e5d6755fd0463e6dcbde7c3df6a6569add44 100644 (file)
--- a/src/bin/stats/tests/Makefile.am
+++ b/src/bin/stats/tests/Makefile.am
@@ -1,6 +1,8 @@
+SUBDIRS = testdata .
+
 PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = b10-stats_test.py b10-stats-httpd_test.py
-EXTRA_DIST = $(PYTESTS) test_utils.py b10-config_test.db
+EXTRA_DIST = $(PYTESTS) test_utils.py
 CLEANFILES = test_utils.pyc
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries
@@ -23,7 +25,7 @@ endif
        PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/stats:$(abs_top_builddir)/src/bin/stats/tests:$(abs_top_builddir)/src/bin/msgq:$(abs_top_builddir)/src/lib/python/isc/config \
        B10_FROM_SOURCE=$(abs_top_srcdir) \
        BIND10_MSGQ_SOCKET_FILE=$(abs_top_builddir)/msgq_socket \
-       CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/bin/stats/tests \
+       CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/bin/stats/tests/testdata \
        B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir) \
        $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
        done

diff --git a/src/bin/stats/tests/b10-config_test.db b/src/bin/stats/tests/b10-config_test.db
deleted file mode 100644 (file)
index b1d6689..0000000
--- a/src/bin/stats/tests/b10-config_test.db
+++ /dev/null
@@ -1 +0,0 @@
-{"version": 2, "Boss": {"components": {"b10-auth": {"kind": "needed", "special": "auth"}, "b10-auth-2": {"kind": "needed", "special": "auth"}}}}

diff --git a/src/bin/stats/tests/test_utils.py b/src/bin/stats/tests/test_utils.py
index f213852e389d2c6d07e1625804031ee4f090ac28..895f64e005a51230dfc1eba466b80dbbd40b7d5b 100644 (file)
--- a/src/bin/stats/tests/test_utils.py
+++ b/src/bin/stats/tests/test_utils.py
@@ -125,7 +125,7 @@ class MockCfgmgr:
     def __init__(self):
         self._started = threading.Event()
         self.cfgmgr = isc.config.cfgmgr.ConfigManager(
-            os.environ['CONFIG_TESTDATA_PATH'], "b10-config_test.db")
+            os.environ['CONFIG_TESTDATA_PATH'], "b10-config.db")
         self.cfgmgr.read_config()
 
     def run(self):

diff --git a/src/bin/stats/tests/testdata/Makefile.am b/src/bin/stats/tests/testdata/Makefile.am
new file mode 100644 (file)
index 0000000..8f9da09
--- /dev/null
+++ b/src/bin/stats/tests/testdata/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = b10-config.db

diff --git a/src/bin/stats/tests/testdata/b10-config.db b/src/bin/stats/tests/testdata/b10-config.db
new file mode 100644 (file)
index 0000000..2f89b98
--- /dev/null
+++ b/src/bin/stats/tests/testdata/b10-config.db
@@ -0,0 +1,14 @@
+{ "version": 2,
+  "Boss": {
+    "components": {
+      "b10-auth": {
+        "kind": "needed",
+        "special": "auth"
+      },
+      "b10-auth-2": {
+        "kind": "needed",
+        "special": "auth"
+      }
+    }
+  }
+}