Commit 854a6bb2 authored by Jameson Rollins's avatar Jameson Rollins
Browse files

Merge tag '1.4.4' into debian

bugfix release
parents 17ba099f 58d14b38
__version__ = '1.4.3'
__version__ = '1.4.4'
......@@ -365,10 +365,10 @@ class NodeManager(object):
self.nodes[node] = Node(node)
def __repr__(self):
return "%s(%r)" % (self.__class__.__name__, self.nodes.keys())
return "%s(%r)" % (self.__class__.__name__, list(self.nodes.keys()))
def __str__(self):
return "<%s %s>" % (self.__class__.__name__, self.nodes.keys())
return "<%s %s>" % (self.__class__.__name__, list(self.nodes.keys()))
def __getitem__(self, node):
"""Retrieve Node object for named node."""
......
......@@ -136,7 +136,7 @@ class GuardAxes(Axes):
@property
def channels(self):
return self.handles.keys()
return list(self.handles.keys())
def get_more_data(self, event):
xlim = self.get_xlim()
......
......@@ -400,10 +400,10 @@ class Worker(multiprocessing.Process):
# SPM snapshots
if self.snapshot_request.is_set():
self._log.info("PVs:")
for channel, pv in sorted(ezca.pvs.iteritems()):
for channel, pv in sorted(ezca.pvs.items()):
self._log.info(" %s = %s" % (pv.pvname, pv.char_value))
self._log.info("SPMs:")
for channel, sp in sorted(ezca.setpoints.iteritems()):
for channel, sp in sorted(ezca.setpoints.items()):
self._log.info(" %s = %s" % (sp[0], sp[1]))
self._log.info("%d PVs, %d SPMs" % (self['PV_TOTAL'], self['SPM_TOTAL']))
if self.snapshot_file:
......
......@@ -199,6 +199,26 @@ gitid1=$(caget -t T1:GRD-TEST1_ARCHIVE_ID)
kill_jobs
test_expect_equal "$gitid0" "$gitid1"
test_begin_subtest "request SPM snapshot"
testioc ${IFO}:TEST- &
sleep .1
guardian --op=PAUSE --ca-prefix=TEST --name=TEST TEST0 &
wait_node_ready TEST
caput -c T1:GRD-TEST_REQUEST C
caput -c T1:GRD-TEST_OP EXEC
cawait T1:GRD-TEST_STATE C
cawait T1:GRD-TEST_OK True
caput -c T1:GRD-TEST_SPM_SNAP True
cawait T1:GRD-TEST_SPM_SNAP False
sleep 1
kill_jobs
cat <<EOF >EXPECTED
T1:TEST-A 4
T1:TEST-B 3
T1:TEST-C 4.0
EOF
test_expect_equal_file $GUARD_ARCHIVE_ROOT/TEST/TEST.spm EXPECTED
################################################################
test_done
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment