ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-20 17:33:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix 'rhizomeprotocol' test failures

Browse Source 
Config option rhizome.direct.peer.count is no longer required.

Bug in new URI parsing code.
This commit is contained in:
Andrew Bettison 2012-12-05 15:23:59 +10:30
parent 8384fed9c5
commit 1a3f916cfb
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
str.c
View File

@ -481,7 +481,7 @@ int str_uri_authority_hostname(const char *auth, const char **partp, size_t *len
while (r > q && isdigit(*--r))
;
if (r < p - 1 && *r == ':')
q = r;
p = r;
if (partp)
*partp = q;
if (lenp)

11
tests/rhizomeprotocol
View File

@ -41,8 +41,8 @@ configure_servald_server() {
executeOk_servald config set debug.rhizome on
executeOk_servald config set debug.rhizometx on
executeOk_servald config set debug.rhizomerx on
executeOk_servald config set server.respawn_on_signal off
executeOk_servald config set mdp.wifi.tick_ms 500
executeOk_servald config set server.respawn_on_crash off
executeOk_servald config set mdp.iftype.wifi.tick_ms 500
executeOk_servald config set mdp.selfannounce.ticks_per_full_address 1
}
@ -206,15 +206,15 @@ setup_HttpAddLocal() {
setup_curl_7
setup_common
set_instance +A
executeOk_servald config set rhizome.api.addfile.uri "/rhizome/secretaddfile"
executeOk_servald config set rhizome.api.addfile.author $SIDA
executeOk_servald config set rhizome.api.addfile.uri_path "/rhizome/secretaddfile"
executeOk_servald config set rhizome.api.addfile.default_author $SIDA
start_servald_instances +A
wait_until rhizome_http_server_started +A
get_rhizome_server_port PORTA +A
}
test_HttpAddLocal() {
echo 'File file1' >file1
executeOk curl --silent --form 'data=@file1' "http://$addr_localhost:$PORTA/rhizome/secretaddfile" --output file1.manifest
executeOk curl --silent --form 'data=@file1' "http://${addr_localhost}:$PORTA/rhizome/secretaddfile" --output file1.manifest
assert_manifest_complete file1.manifest
executeOk_servald rhizome list ''
assert_rhizome_list --fromhere=1 file1
@ -236,7 +236,6 @@ setup_sync() {
executeOk_servald config set debug.rhizome on
executeOk_servald config set debug.rhizometx on
executeOk_servald config set debug.rhizomerx on
executeOk_servald config set rhizome.direct.peer.count "1"
executeOk_servald config set rhizome.direct.peer.0 "http://${addr_localhost}:${PORTA}"
rhizome_add_file file2
BID2=$BID