test-config: add tests for the config_set API
Expose the `config_set` C API as a set of simple commands in order to facilitate testing. Add tests for the `config_set` API as well as for `git_config_get_*()` family for the usual config files. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Tanay Abhra <tanayabh@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tanay Abhra
Junio C Hamano
parent
3c8687a73e
commit
4c715ebb96
1
.gitignore
vendored
1
.gitignore
vendored
@ -178,6 +178,7 @@
|
||||
/gitweb/static/gitweb.min.*
|
||||
/test-chmtime
|
||||
/test-ctype
|
||||
/test-config
|
||||
/test-date
|
||||
/test-delta
|
||||
/test-dump-cache-tree
|
||||
|
||||
1
Makefile
1
Makefile
@ -551,6 +551,7 @@ PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
|
||||
|
||||
TEST_PROGRAMS_NEED_X += test-chmtime
|
||||
TEST_PROGRAMS_NEED_X += test-ctype
|
||||
TEST_PROGRAMS_NEED_X += test-config
|
||||
TEST_PROGRAMS_NEED_X += test-date
|
||||
TEST_PROGRAMS_NEED_X += test-delta
|
||||
TEST_PROGRAMS_NEED_X += test-dump-cache-tree
|
||||
|
||||
200
t/t1308-config-set.sh
Executable file
200
t/t1308-config-set.sh
Executable file
@ -0,0 +1,200 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='Test git config-set API in different settings'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
# 'check_config get_* section.key value' verifies that the entry for
|
||||
# section.key is 'value'
|
||||
check_config () {
|
||||
if test "$1" = expect_code
|
||||
then
|
||||
expect_code="$2" && shift && shift
|
||||
else
|
||||
expect_code=0
|
||||
fi &&
|
||||
op=$1 key=$2 && shift && shift &&
|
||||
if test $# != 0
|
||||
then
|
||||
printf "%s\n" "$@"
|
||||
fi >expect &&
|
||||
test_expect_code $expect_code test-config "$op" "$key" >actual &&
|
||||
test_cmp expect actual
|
||||
}
|
||||
|
||||
test_expect_success 'setup default config' '
|
||||
cat >.git/config <<\EOF
|
||||
[case]
|
||||
penguin = very blue
|
||||
Movie = BadPhysics
|
||||
UPPERCASE = true
|
||||
MixedCase = true
|
||||
my =
|
||||
foo
|
||||
baz = sam
|
||||
[Cores]
|
||||
WhatEver = Second
|
||||
baz = bar
|
||||
[cores]
|
||||
baz = bat
|
||||
[CORES]
|
||||
baz = ball
|
||||
[my "Foo bAr"]
|
||||
hi = mixed-case
|
||||
[my "FOO BAR"]
|
||||
hi = upper-case
|
||||
[my "foo bar"]
|
||||
hi = lower-case
|
||||
[case]
|
||||
baz = bat
|
||||
baz = hask
|
||||
[lamb]
|
||||
chop = 65
|
||||
head = none
|
||||
[goat]
|
||||
legs = 4
|
||||
head = true
|
||||
skin = false
|
||||
nose = 1
|
||||
horns
|
||||
EOF
|
||||
'
|
||||
|
||||
test_expect_success 'get value for a simple key' '
|
||||
check_config get_value case.penguin "very blue"
|
||||
'
|
||||
|
||||
test_expect_success 'get value for a key with value as an empty string' '
|
||||
check_config get_value case.my ""
|
||||
'
|
||||
|
||||
test_expect_success 'get value for a key with value as NULL' '
|
||||
check_config get_value case.foo "(NULL)"
|
||||
'
|
||||
|
||||
test_expect_success 'upper case key' '
|
||||
check_config get_value case.UPPERCASE "true" &&
|
||||
check_config get_value case.uppercase "true"
|
||||
'
|
||||
|
||||
test_expect_success 'mixed case key' '
|
||||
check_config get_value case.MixedCase "true" &&
|
||||
check_config get_value case.MIXEDCASE "true" &&
|
||||
check_config get_value case.mixedcase "true"
|
||||
'
|
||||
|
||||
test_expect_success 'key and value with mixed case' '
|
||||
check_config get_value case.Movie "BadPhysics"
|
||||
'
|
||||
|
||||
test_expect_success 'key with case sensitive subsection' '
|
||||
check_config get_value "my.Foo bAr.hi" "mixed-case" &&
|
||||
check_config get_value "my.FOO BAR.hi" "upper-case" &&
|
||||
check_config get_value "my.foo bar.hi" "lower-case"
|
||||
'
|
||||
|
||||
test_expect_success 'key with case insensitive section header' '
|
||||
check_config get_value cores.baz "ball" &&
|
||||
check_config get_value Cores.baz "ball" &&
|
||||
check_config get_value CORES.baz "ball" &&
|
||||
check_config get_value coreS.baz "ball"
|
||||
'
|
||||
|
||||
test_expect_success 'key with case insensitive section header & variable' '
|
||||
check_config get_value CORES.BAZ "ball" &&
|
||||
check_config get_value cores.baz "ball" &&
|
||||
check_config get_value cores.BaZ "ball" &&
|
||||
check_config get_value cOreS.bAz "ball"
|
||||
'
|
||||
|
||||
test_expect_success 'find value with misspelled key' '
|
||||
check_config expect_code 1 get_value "my.fOo Bar.hi" "Value not found for \"my.fOo Bar.hi\""
|
||||
'
|
||||
|
||||
test_expect_success 'find value with the highest priority' '
|
||||
check_config get_value case.baz "hask"
|
||||
'
|
||||
|
||||
test_expect_success 'find integer value for a key' '
|
||||
check_config get_int lamb.chop 65
|
||||
'
|
||||
|
||||
test_expect_success 'find integer if value is non parse-able' '
|
||||
check_config expect_code 128 get_int lamb.head
|
||||
'
|
||||
|
||||
test_expect_success 'find bool value for the entered key' '
|
||||
check_config get_bool goat.head 1 &&
|
||||
check_config get_bool goat.skin 0 &&
|
||||
check_config get_bool goat.nose 1 &&
|
||||
check_config get_bool goat.horns 1 &&
|
||||
check_config get_bool goat.legs 1
|
||||
'
|
||||
|
||||
test_expect_success 'find multiple values' '
|
||||
check_config get_value_multi case.baz sam bat hask
|
||||
'
|
||||
|
||||
test_expect_success 'find value from a configset' '
|
||||
cat >config2 <<-\EOF &&
|
||||
[case]
|
||||
baz = lama
|
||||
[my]
|
||||
new = silk
|
||||
[case]
|
||||
baz = ball
|
||||
EOF
|
||||
echo silk >expect &&
|
||||
test-config configset_get_value my.new config2 .git/config >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'find value with highest priority from a configset' '
|
||||
echo hask >expect &&
|
||||
test-config configset_get_value case.baz config2 .git/config >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'find value_list for a key from a configset' '
|
||||
cat >except <<-\EOF &&
|
||||
sam
|
||||
bat
|
||||
hask
|
||||
lama
|
||||
ball
|
||||
EOF
|
||||
test-config configset_get_value case.baz config2 .git/config >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'proper error on non-existent files' '
|
||||
echo "Error (-1) reading configuration file non-existent-file." >expect &&
|
||||
test_expect_code 2 test-config configset_get_value foo.bar non-existent-file 2>actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success POSIXPERM,SANITY 'proper error on non-accessible files' '
|
||||
chmod -r .git/config &&
|
||||
test_when_finished "chmod +r .git/config" &&
|
||||
echo "Error (-1) reading configuration file .git/config." >expect &&
|
||||
test_expect_code 2 test-config configset_get_value foo.bar .git/config 2>actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'proper error on error in default config files' '
|
||||
cp .git/config .git/config.old &&
|
||||
test_when_finished "mv .git/config.old .git/config" &&
|
||||
echo "[" >>.git/config &&
|
||||
echo "fatal: bad config file line 35 in .git/config" >expect &&
|
||||
test_expect_code 128 test-config get_value foo.bar 2>actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'proper error on error in custom config files' '
|
||||
echo "[" >>syntax-error &&
|
||||
echo "fatal: bad config file line 1 in syntax-error" >expect &&
|
||||
test_expect_code 128 test-config configset_get_value foo.bar syntax-error 2>actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
142
test-config.c
Normal file
142
test-config.c
Normal file
@ -0,0 +1,142 @@
|
||||
#include "cache.h"
|
||||
#include "string-list.h"
|
||||
|
||||
/*
|
||||
* This program exposes the C API of the configuration mechanism
|
||||
* as a set of simple commands in order to facilitate testing.
|
||||
*
|
||||
* Reads stdin and prints result of command to stdout:
|
||||
*
|
||||
* get_value -> prints the value with highest priority for the entered key
|
||||
*
|
||||
* get_value_multi -> prints all values for the entered key in increasing order
|
||||
* of priority
|
||||
*
|
||||
* get_int -> print integer value for the entered key or die
|
||||
*
|
||||
* get_bool -> print bool value for the entered key or die
|
||||
*
|
||||
* configset_get_value -> returns value with the highest priority for the entered key
|
||||
* from a config_set constructed from files entered as arguments.
|
||||
*
|
||||
* configset_get_value_multi -> returns value_list for the entered key sorted in
|
||||
* ascending order of priority from a config_set
|
||||
* constructed from files entered as arguments.
|
||||
*
|
||||
* Examples:
|
||||
*
|
||||
* To print the value with highest priority for key "foo.bAr Baz.rock":
|
||||
* test-config get_value "foo.bAr Baz.rock"
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int i, val;
|
||||
const char *v;
|
||||
const struct string_list *strptr;
|
||||
struct config_set cs;
|
||||
git_configset_init(&cs);
|
||||
|
||||
if (argc < 2) {
|
||||
fprintf(stderr, "Please, provide a command name on the command-line\n");
|
||||
goto exit1;
|
||||
} else if (argc == 3 && !strcmp(argv[1], "get_value")) {
|
||||
if (!git_config_get_value(argv[2], &v)) {
|
||||
if (!v)
|
||||
printf("(NULL)\n");
|
||||
else
|
||||
printf("%s\n", v);
|
||||
goto exit0;
|
||||
} else {
|
||||
printf("Value not found for \"%s\"\n", argv[2]);
|
||||
goto exit1;
|
||||
}
|
||||
} else if (argc == 3 && !strcmp(argv[1], "get_value_multi")) {
|
||||
strptr = git_config_get_value_multi(argv[2]);
|
||||
if (strptr) {
|
||||
for (i = 0; i < strptr->nr; i++) {
|
||||
v = strptr->items[i].string;
|
||||
if (!v)
|
||||
printf("(NULL)\n");
|
||||
else
|
||||
printf("%s\n", v);
|
||||
}
|
||||
goto exit0;
|
||||
} else {
|
||||
printf("Value not found for \"%s\"\n", argv[2]);
|
||||
goto exit1;
|
||||
}
|
||||
} else if (argc == 3 && !strcmp(argv[1], "get_int")) {
|
||||
if (!git_config_get_int(argv[2], &val)) {
|
||||
printf("%d\n", val);
|
||||
goto exit0;
|
||||
} else {
|
||||
printf("Value not found for \"%s\"\n", argv[2]);
|
||||
goto exit1;
|
||||
}
|
||||
} else if (argc == 3 && !strcmp(argv[1], "get_bool")) {
|
||||
if (!git_config_get_bool(argv[2], &val)) {
|
||||
printf("%d\n", val);
|
||||
goto exit0;
|
||||
} else {
|
||||
printf("Value not found for \"%s\"\n", argv[2]);
|
||||
goto exit1;
|
||||
}
|
||||
} else if (!strcmp(argv[1], "configset_get_value")) {
|
||||
for (i = 3; i < argc; i++) {
|
||||
int err;
|
||||
if ((err = git_configset_add_file(&cs, argv[i]))) {
|
||||
fprintf(stderr, "Error (%d) reading configuration file %s.\n", err, argv[i]);
|
||||
goto exit2;
|
||||
}
|
||||
}
|
||||
if (!git_configset_get_value(&cs, argv[2], &v)) {
|
||||
if (!v)
|
||||
printf("(NULL)\n");
|
||||
else
|
||||
printf("%s\n", v);
|
||||
goto exit0;
|
||||
} else {
|
||||
printf("Value not found for \"%s\"\n", argv[2]);
|
||||
goto exit1;
|
||||
}
|
||||
} else if (!strcmp(argv[1], "configset_get_value_multi")) {
|
||||
for (i = 3; i < argc; i++) {
|
||||
int err;
|
||||
if ((err = git_configset_add_file(&cs, argv[i]))) {
|
||||
fprintf(stderr, "Error (%d) reading configuration file %s.\n", err, argv[i]);
|
||||
goto exit2;
|
||||
}
|
||||
}
|
||||
strptr = git_configset_get_value_multi(&cs, argv[2]);
|
||||
if (strptr) {
|
||||
for (i = 0; i < strptr->nr; i++) {
|
||||
v = strptr->items[i].string;
|
||||
if (!v)
|
||||
printf("(NULL)\n");
|
||||
else
|
||||
printf("%s\n", v);
|
||||
}
|
||||
goto exit0;
|
||||
} else {
|
||||
printf("Value not found for \"%s\"\n", argv[2]);
|
||||
goto exit1;
|
||||
}
|
||||
}
|
||||
|
||||
die("%s: Please check the syntax and the function name", argv[0]);
|
||||
|
||||
exit0:
|
||||
git_configset_clear(&cs);
|
||||
return 0;
|
||||
|
||||
exit1:
|
||||
git_configset_clear(&cs);
|
||||
return 1;
|
||||
|
||||
exit2:
|
||||
git_configset_clear(&cs);
|
||||
return 2;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user