Browse Source

Address lint concerns

pull/1123/head
Hamish Coleman 1 year ago
parent
commit
7b77950352
  1. 4
      scripts/n2n-ctl
  2. 22
      scripts/test_integration_edge.sh
  3. 16
      scripts/test_integration_supernode.sh

4
scripts/n2n-ctl

@ -48,7 +48,7 @@ class JsonUDP():
data = json.loads(data.decode('utf8')) data = json.loads(data.decode('utf8'))
# TODO: We assume the first packet we get will be tagged for us # TODO: We assume the first packet we get will be tagged for us
assert(data['_tag'] == tagstr) assert (data['_tag'] == tagstr)
if data['_type'] == 'error': if data['_type'] == 'error':
raise ValueError('Error: {}'.format(data['error'])) raise ValueError('Error: {}'.format(data['error']))
@ -128,7 +128,7 @@ class JsonUDP():
data, _ = self.sock.recvfrom(1024) data, _ = self.sock.recvfrom(1024)
data = json.loads(data.decode('utf8')) data = json.loads(data.decode('utf8'))
# assert(data['_tag'] == tagstr) # assert(data['_tag'] == tagstr)
assert(data['_type'] == 'event') assert (data['_type'] == 'event')
del data['_tag'] del data['_tag']
del data['_type'] del data['_type']

22
scripts/test_integration_edge.sh

@ -16,16 +16,16 @@ docmd() {
} }
# start a supernode # start a supernode
docmd ${BINDIR}/supernode -v docmd "${BINDIR}"/supernode -v
# Start the edge in the background # Start the edge in the background
docmd sudo ${BINDIR}/edge -l localhost:7654 -c test >/dev/null docmd sudo "${BINDIR}"/edge -l localhost:7654 -c test >/dev/null
# TODO: # TODO:
# - send edge messages to stderr? # - send edge messages to stderr?
docmd ${TOPDIR}/scripts/n2n-ctl communities docmd "${TOPDIR}"/scripts/n2n-ctl communities
docmd ${TOPDIR}/scripts/n2n-ctl packetstats docmd "${TOPDIR}"/scripts/n2n-ctl packetstats
docmd ${TOPDIR}/scripts/n2n-ctl edges --raw docmd "${TOPDIR}"/scripts/n2n-ctl edges --raw
# TODO: # TODO:
# docmd ${TOPDIR}/scripts/n2n-ctl supernodes --raw # docmd ${TOPDIR}/scripts/n2n-ctl supernodes --raw
@ -35,15 +35,15 @@ docmd ${TOPDIR}/scripts/n2n-ctl edges --raw
# - last_seen timestamp # - last_seen timestamp
# - uptime # - uptime
docmd ${TOPDIR}/scripts/n2n-ctl verbose docmd "${TOPDIR}"/scripts/n2n-ctl verbose
docmd ${TOPDIR}/scripts/n2n-ctl --write verbose 1 2>/dev/null docmd "${TOPDIR}"/scripts/n2n-ctl --write verbose 1 2>/dev/null
echo $? echo $?
docmd ${TOPDIR}/scripts/n2n-ctl -k $AUTH --write verbose 1 docmd "${TOPDIR}"/scripts/n2n-ctl -k $AUTH --write verbose 1
# looks strange, but we are querying the state of the "stop" verb # looks strange, but we are querying the state of the "stop" verb
docmd ${TOPDIR}/scripts/n2n-ctl stop docmd "${TOPDIR}"/scripts/n2n-ctl stop
# stop them both # stop them both
docmd ${TOPDIR}/scripts/n2n-ctl -k $AUTH --write stop docmd "${TOPDIR}"/scripts/n2n-ctl -k $AUTH --write stop
docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 -k $AUTH --write stop docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 -k $AUTH --write stop

16
scripts/test_integration_supernode.sh

@ -16,18 +16,18 @@ docmd() {
} }
# start it running in the background # start it running in the background
docmd ${BINDIR}/supernode -v docmd "${BINDIR}"/supernode -v
docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 communities docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 communities
docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 packetstats docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 packetstats
docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 edges --raw docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 edges --raw
docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 verbose docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 verbose
docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 -k $AUTH --write verbose 1 docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 -k $AUTH --write verbose 1
# looks strange, but we are querying the state of the "stop" verb # looks strange, but we are querying the state of the "stop" verb
docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 stop docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 stop
# stop it # stop it
docmd ${TOPDIR}/scripts/n2n-ctl -t 5645 -k $AUTH --write stop docmd "${TOPDIR}"/scripts/n2n-ctl -t 5645 -k $AUTH --write stop

Loading…
Cancel
Save