t/kvs: Add test_kvs_key to kvs helper

Adjust t1000-kvs and t1004-kvs-namespace accordingly.
flux-framework · Jan 4, 2018 · cf3c416 · cf3c416
1 parent 480bd9f
commit cf3c416
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/t/kvs/kvs-helper.sh b/t/kvs/kvs-helper.sh
@@ -1,6 +1,16 @@
 #!/bin/sh
 #
 
+# KVS Common helper functions
+
+# arg1 - key to retrieve
+# arg2 - expected value
+test_kvs_key() {
+	flux kvs get --json "$1" >output
+	echo "$2" >expected
+	test_cmp expected output
+}
+
 # KVS Watch helper functions
 
 # Various loops to wait for conditions before moving on.  There is

diff --git a/t/t1000-kvs.t b/t/t1000-kvs.t
@@ -7,6 +7,8 @@ These are the basic/core flux kvs tests and should be run before
 any other tests that require kvs functionality.
 '
 
+. `dirname $0`/kvs/kvs-helper.sh
+
 . `dirname $0`/sharness.sh
 
 if test "$TEST_LONG" = "t"; then
@@ -23,12 +25,6 @@ KEY=test.a.b.c
 SUBDIR1=test.a.b.d
 SUBDIR2=test.a.b.e
 
-test_kvs_key() {
-	flux kvs get --json "$1" >output
-	echo "$2" >expected
-	test_cmp expected output
-}
-
 #
 # Basic put, get, unlink tests
 #

diff --git a/t/t1004-kvs-namespace.t b/t/t1004-kvs-namespace.t
@@ -29,12 +29,6 @@ NAMESPACETEST=namespacetest
 NAMESPACETMP=namespacetmp
 NAMESPACERANK1=namespacerank1
 
-test_kvs_key() {
-	flux kvs get --json "$1" >output
-	echo "$2" >expected
-	test_cmp expected output
-}
-
 test_kvs_key_namespace() {
         export FLUX_KVS_NAMESPACE=$1
 	flux kvs get --json "$2" >output