[2641] Move cmdctl-accounts.csv file back to where it was

diff --git a/src/bin/cmdctl/Makefile.am b/src/bin/cmdctl/Makefile.am
index 34886a96c201cade7e928b595675b29557e3843d..72a400abdc4e086b79d075eaf50bee37aab11e38 100644 (file)
--- a/src/bin/cmdctl/Makefile.am
+++ b/src/bin/cmdctl/Makefile.am
@@ -21,7 +21,8 @@ CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/cmdctl_messages.pyc
 
 man_MANS = b10-cmdctl.8 b10-certgen.1
 DISTCLEANFILES = $(man_MANS) cmdctl-certfile.pem cmdctl-keyfile.pem
-EXTRA_DIST = $(man_MANS) b10-certgen.xml b10-cmdctl.xml cmdctl_messages.mes
+EXTRA_DIST  = $(man_MANS) b10-certgen.xml b10-cmdctl.xml cmdctl_messages.mes
+EXTRA_DIST += cmdctl-accounts.csv
 
 if GENERATE_DOCS
 

diff --git a/src/bin/cmdctl/cmdctl.py.in b/src/bin/cmdctl/cmdctl.py.in
index c3aceb2f7b3c4bd13dc33992e1932875d9c4be21..d35f6ccf72645df0718b6d40643e74c559e41a5d 100755 (executable)
--- a/src/bin/cmdctl/cmdctl.py.in
+++ b/src/bin/cmdctl/cmdctl.py.in
@@ -466,7 +466,7 @@ class CommandControl():
         and user accounts file in source code. '''
         if "B10_FROM_SOURCE" in os.environ:
             sysconf_path = os.environ["B10_FROM_SOURCE"] + "/src/bin/cmdctl/"
-            accountsfile  = sysconf_path + "tests/testdata/cmdctl-accounts.csv"
+            accountsfile  = sysconf_path + "cmdctl-accounts.csv"
             keyfile = sysconf_path + "cmdctl-keyfile.pem"
             certfile = sysconf_path + "cmdctl-certfile.pem"
             return (keyfile, certfile, accountsfile)

diff --git a/src/bin/cmdctl/tests/Makefile.am b/src/bin/cmdctl/tests/Makefile.am
index 0903ef2278057ea7e8298965f9ef8faa40767b7e..e2e0361b8537dca0c1c60108b022493f1efbb8b7 100644 (file)
--- a/src/bin/cmdctl/tests/Makefile.am
+++ b/src/bin/cmdctl/tests/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST = $(PYTESTS)
 EXTRA_DIST += testdata/expired-certfile.pem
 EXTRA_DIST += testdata/mangled-certfile.pem
 EXTRA_DIST += testdata/noca-certfile.pem
-EXTRA_DIST += cmdctl-accounts.csv
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries
 # required by loadable python modules.
@@ -27,7 +26,7 @@ endif
        $(LIBRARY_PATH_PLACEHOLDER) \
        PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_builddir)/src/bin/cmdctl \
        CMDCTL_BUILD_PATH=$(abs_top_builddir)/src/bin/cmdctl \
-       CMDCTL_TESTDATA_PATH=$(abs_top_srcdir)/src/bin/cmdctl/tests/testdata \
+       CMDCTL_TESTDATA_PATH=$(abs_top_srcdir)/src/bin/cmdctl \
        B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir) \
        $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
        done

diff --git a/src/bin/cmdctl/tests/testdata/cmdctl-accounts.csv b/src/bin/cmdctl/tests/testdata/cmdctl-accounts.csv
deleted file mode 100644 (file)
index dc1a052..0000000
--- a/src/bin/cmdctl/tests/testdata/cmdctl-accounts.csv
+++ /dev/null
@@ -1 +0,0 @@
-root,6f0c73bd33101a5ec0294b3ca39fec90ef4717fe,"\7f{5hV&$^(]!uV,3H>E~=f`I;,HgMl""`Eyao4^0l|Nlz|%R9Y0v)#/t'u@CzJ$U\7f)"\r