summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
3c7f355)
- With "uci -P xxx/ export", changes in "xxx/" should be applied last.
- With "uci -p xxx/ commit", changes in "xxx/" should be applied before
ctx->savedir.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
--- /dev/null
+
+config sectype 'sec0'
+ list li0 '1'
+ list li0 '0'
+
--- /dev/null
+package delta
+
+config sectype 'sec0'
+ list li0 '0'
+ list li0 '1'
+++ /dev/null
-
-config sectype 'sec0'
- list li0 '1'
- list li0 '0'
-
test_add_delta() {
local new_savedir="$TMP_DIR/new_savedir"
local config_delta="$CONFIG_DIR/delta"
test_add_delta() {
local new_savedir="$TMP_DIR/new_savedir"
local config_delta="$CONFIG_DIR/delta"
# add normal changes
touch "$config_delta"
# add normal changes
touch "$config_delta"
assertEquals "delta.sec0='sectype'
delta.sec0.li0+='0'" "$($UCI changes)"
assertEquals "delta.sec0='sectype'
delta.sec0.li0+='0'" "$($UCI changes)"
- # check combined changes. order matters here.
+ # check combined changes. Order matters here.
+ cmdoutput="$($UCI -P "$new_savedir" changes)"
+ assertTrue "$?"
assertEquals "delta.sec0='sectype'
assertEquals "delta.sec0='sectype'
-delta.sec0.li0+='0'" "$($UCI -P "$new_savedir" changes)"
+delta.sec0.li0+='1'" "$cmdoutput"
+
+ # check combined export. Order matters here.
+ cmdoutput="$($UCI -P "$new_savedir" export)"
+ assertTrue "$?"
+ assertEquals "$(cat $REF_DIR/cli.options.delta.export.result)" "$cmdoutput"
# check CLI_FLAG_NOCOMMIT with -P option.
$UCI -P "$new_savedir" commit
# check CLI_FLAG_NOCOMMIT with -P option.
$UCI -P "$new_savedir" commit
# check normal commit.
$UCI -p "$new_savedir" commit
assertTrue "$?"
# check normal commit.
$UCI -p "$new_savedir" commit
assertTrue "$?"
- assertSameFile "$REF_DIR/options.delta.result" "$config_delta"
+ assertSameFile "$REF_DIR/cli.options.delta.commit.result" "$config_delta"
rm -rf "$new_savedir"
rm -f "$config_delta"
rm -rf "$new_savedir"
rm -f "$config_delta"