Merge lp:~epics-core/epics-gateway/dbe_props into lp:~epics-core/epics-gateway/original-trunk

[Ralph Lange]

Adding support for DBE_PROPERTY and the first handful of tests.
Based on Murali's branch of the same name, with some massaging of the test setup, and some changes to the property update implementation.

[Andrew Johnson (anj)]

Can you document the python prerequisites to run the tests please. Make is also warning about a circular dependency:

make[3]: Entering directory '/local/anj/dbe_props/testTop/pyTestsApp/O.linux-x86_64'
make[3]: Circular test.db <- test.db dependency dropped.
perl -MTest::Harness -e 'runtests @ARGV if @ARGV;' runTests.py.t
runTests.py.t .. Traceback (most recent call last):
  File "./runTests.py", line 4, in <module>
    import argparse
ImportError: No module named argparse
runTests.py.t .. Dubious, test returned 1 (wstat 256, 0x100)
No subtests run

Test Summary Report
-------------------
runTests.py.t (Wstat: 256 Tests: 0 Failed: 0)
  Non-zero exit status: 1
  Parse errors: No plan found in TAP output
Files=1, Tests=0, 0 wallclock secs ( 0.02 usr 0.01 sys + 0.03 cusr 0.02 csys = 0.08 CPU)
Result: FAIL
Failed 1/1 test programs. 0/0 subtests failed.
/local/anj/base-3.14/configure/RULES_BUILD:341: recipe for target 'runtests' failed
make[3]: [runtests] Error 1 (ignored)
make[3]: Leaving directory '/local/anj/dbe_props/testTop/pyTestsApp/O.linux-x86_64'

On RHEL6.6 I installed python-argparse to fix the import problem above, but there is no python-tap package so I'm currently stuck here:

runTests.py.t .. Traceback (most recent call last):
  File "./runTests.py", line 8, in <module>
    from tap import TAPTestRunner
ImportError: No module named tap

[Ralph Lange (ralph-lange)]

That's tappy that you suggested to me.

[Andrew Johnson (anj)]

Thanks. The python prerequisites are thus argparse (RHEL6's RPM python-argparse) and tappy (PyPI package tap.py).

The tests all fail for me, but they do now run:

tux% cat runTests.py.tap
# TAP results for DBEValueTest
not ok 1 - DBE_VALUE monitor on an ai - value changes generate events.
# TAP results for DBELogTest
not ok 2 - DBE_LOG monitor on an ai with an ADEL - leaving the deadband generates events.
# TAP results for DBEAlarmTest
not ok 3 - DBE_ALARM monitor on an ai with two alarm levels - crossing the level generates updates
# TAP results for DBEPropTest
not ok 4 - DBE_PROPERTY monitor on an ai - value changes generate no events; property changes generate events.
# TAP results for PropertyCacheTest
not ok 5 - Get PV (value) through GW - change HIGH directly - get the DBR_CTRL of the PV through GW
not ok 6 - Get PV (value) through GW - disconnect client - change HIGH directly - get the DBR_CTRL of the PV through GW
not ok 7 - Monitor PV (value events) through GW - change HIGH directly - get the DBR_CTRL of the PV through GW

[Ralph Lange (ralph-lange)]

Encouraging.

I will add pyepics3 to the prerequisites.

[Andrew Johnson (anj)]

Ok. That should actually by pyepics (version 3). I installed it, but don't see any difference in the .tap output yet, all tests still fail. Also when I try to run the pyTest.py program on its own or through the runTests.py.t script it fails:

tux% ./runTests.py
Warning: TOP not set. Using default value of '..'
Cannot find the gateway executable to test ../../bin/linux-x86_64/gateway

I think that error message is wrong, it doesn't actually set a default value at all (and if it did it should be '../..' when running from the O.<host> directory).

Now executing runTests.py with --verbose I get this to start with:

tux$ TOP=../.. ./runTests.py --verbose
DBE_VALUE monitor on an ai - value changes generate events. ... Starting the IOC using
softIoc -d test.db
Warning: IOC is booting with TOP = "../.."
          but was built with TOP = "/home/phoebus3/ANJ/epics/base/3-14-dev"
filename="../dbLexRoutines.c" line number=240
No such file or directory dbRead opening file test.db
Starting the CA Gateway using
../../../bin/linux-x86_64/gateway -sip localhost -sport 12783 -cip localhost -cport 12782 -access access.txt -pvlist pvlist.txt -archive -prefix gwtest
ERROR
...

I copied the test.db file into the O.<host> directory (see my previous warning about the circular dependency for why it wasn't being installed) and now it gets further, but still fails everything:

tux$ TOP=../.. ./runTests.py
EEEEEEE
======================================================================
ERROR: DBE_VALUE monitor on an ai - value changes generate events.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/local/anj/dbe_props/testTop/pyTestsApp/O.linux-x86_64/DBEValueTest.py", line 19, in setUp
    os.environ["EPICS_CA_ADDR_LIST"] =
        "localhost:{} localhost:{}".format(gwtests.iocPort,gwtests.gwPort)
ValueError: zero length field name in format
...

I don't know how to go about fixing that, my python-foo is not strong enough.

It also left my terminal in a bad state; I had to run 'stty sane' to restore it. That's because your stop() routine is terminating the IOC process that in my case is waiting inside readline() (which wants to do key echoing itself). You could avoid that problem by giving the IOC a private stream for stdin and just closing that stream when you want the IOC to exit (or send it an 'exit' command and then close the stream) and waiting for the process to die.

Alternatively about a year ago I modified the base command-line history stuff to allow readline to be disabled using an environment variable, but I haven't merged my ioc-test-module branch that its in yet. I could pull out and merge that particular change if you thing it would be worthwhile.

[Ralph Lange (ralph-lange)]

Thanks for the hint with the private streams - I had to 'reset' my terminal countless times, and wondered what to do about it.

The tests were originally intended to be run on the pyTestsApp directory (note that the runTests.py script takes arguments and thus depends on the arg parser, needed EPICS_HOST_ARCH to be set and was making a bunch of assumptions.

For the time being, I left the ability to run from above the O.<T_A> directory (because it is very handy when developing), and distinguish two cases:
1. running from O.<T_A>, as part of an EPICS build. TOP and T_A are set and being used. If '-tap' is found on the command line (set by the perl wrapper), TAP output is being generated on stdout.
2. running manually from pyTestsApp. TOP defaults to '..', and EPICS_HOST_ARCH must be set.

I should probably remove the command line args to runTests.py and pass the verbosity in the environment. Then a manual run can use one of the standard test runners (preferably nosetests), which automagically finds all test classes and allows selecting the tests to be run.

On a related issue: I plan to add proper support for standard python unit tests using nosetests to EPICS Base. The perl wrapper to run a python script is very awkward.

Stay around for an update of this branch next week.

[lp:~epics-core/epics-gateway/dbe_props]

234. By Ralph Lange on 2015-06-29

test: add README

235. By Ralph Lange on 2015-06-29

test: fix Makefile to work with 3.14 and 3.15

[Ralph Lange (ralph-lange)]

The circular dependency was a 3.14 issue (overuse of VPATH). Added a workaround to get things installed in the O.<arch> directory under 3.14 and 3.15.

Added a README.

Now the tests run for me ('make runtests') on 3.14 and 3.15.
On 3.15, all tests pass. On 3.14, some are failing. Will investigate further.

[lp:~epics-core/epics-gateway/dbe_props]

236. By Ralph Lange on 2015-06-30

test: rename test classes to match unittest conventions

237. By Ralph Lange on 2015-06-30

test: remove runner script, move configuration setup to gwstats, make single tests executable

238. By Ralph Lange on 2015-06-30

test: update README

239. By Ralph Lange on 2015-06-30

test: stop IOC via stdin pipe to avoid leaving terminal in bad state

[Ralph Lange (ralph-lange)]

All issues have been taken care of. Please retry.

- Added README.
- Removed runner script (and argparse dependency).
- Renamed test files/classes to match unittest conventions
- Stopping IOC with input stream to avoid terminal screwup

Under plain 3.14, some tests are failing, as 3.14 does not fully support DBE_PROPERTY.
Under the Debian packaged version (called 3.14), the necessary patches have been backported.

[lp:~epics-core/epics-gateway/dbe_props]

240. By Ralph Lange on 2015-06-30

test: fix wrong indention for main script bodies

[Murali Shankar (mshankar)]

I downloaded and tested against base-3.15.2​ on RHEL6 64 bit box with pyepics-3.2.4​. I was able to get the tests running with the EPICS build system and also under nosetests.

review: Approve

[Andrew Johnson (anj)]

I still get all tests failing, whether I use use 'make runtests' or 'nosetests --exe' in the pyTestsApp directory. This is the output to the end of the first test, the others give exactly the same traceback:

tux% nosetests --exe
EEEEEEE
======================================================================
ERROR: DBE_ALARM monitor on an ai with two alarm levels - crossing the level generates updates
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/local/anj/dbe_props/testTop/pyTestsApp/TestDBEAlarm.py", line 20, in setUp
    os.environ["EPICS_CA_ADDR_LIST"] = "localhost:{} localhost:{}".format(gwtests.iocPort,gwtests.gwPort)
ValueError: zero length field name in format
-------------------- >> begin captured stdout << ---------------------
Warning: TOP not set. Using default value of '..'
Warning: EPICS_BASE not set. Running 'softIoc' executable in PATH

--------------------- >> end captured stdout << ----------------------

======================================================================

Setting VERBOSE=YES shows the IOC starting and stopping (it looks like it could be starting the IOCs all at once, but that's probably just the order of capturing and displaying the stdout streams).

What could I be doing wrong?

[Murali Shankar (mshankar)]

Would you know the version of Python being used? I'm using 2.7.6 here.

Regards,
Murali

________________________________________
From: <email address hidden> <email address hidden> on behalf of Andrew Johnson <email address hidden>
Sent: Wednesday, July 1, 2015 10:27 AM
To: Ralph Lange
Subject: Re: [Merge] lp:~epics-core/epics-gateway/dbe_props into lp:epics-gateway

I still get all tests failing, whether I use use 'make runtests' or 'nosetests --exe' in the pyTestsApp directory. This is the output to the end of the first test, the others give exactly the same traceback:

tux% nosetests --exe
EEEEEEE
======================================================================
ERROR: DBE_ALARM monitor on an ai with two alarm levels - crossing the level generates updates
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/local/anj/dbe_props/testTop/pyTestsApp/TestDBEAlarm.py", line 20, in setUp
    os.environ["EPICS_CA_ADDR_LIST"] = "localhost:{} localhost:{}".format(gwtests.iocPort,gwtests.gwPort)
ValueError: zero length field name in format
-------------------- >> begin captured stdout << ---------------------
Warning: TOP not set. Using default value of '..'
Warning: EPICS_BASE not set. Running 'softIoc' executable in PATH

--------------------- >> end captured stdout << ----------------------

======================================================================

Setting VERBOSE=YES shows the IOC starting and stopping (it looks like it could be starting the IOCs all at once, but that's probably just the order of capturing and displaying the stdout streams).

What could I be doing wrong?

--
https://code.launchpad.net/~epics-core/epics-gateway/dbe_props/+merge/262832
You are reviewing the proposed merge of lp:~epics-core/epics-gateway/dbe_props into lp:epics-gateway.

[Ralph Lange (ralph-lange)]

Ah, found it!

Omitting the positional parameters in the format string is allowed starting with Python 2.7...

Please replace the two empty squirly brackets in the statement with their explicit variants:
'{} {}' -> '{0} {1}'

Sorry for the inconvenience!

[Andrew Johnson (anj)]

RHEL 6.6 ships with Python 2.6.6 so that made a major difference, would you like me to commit those changes?

I still have test failures under 3.14, but not 3.15 — could you maybe check for the Base version and disable these tests under 3.14? With epicsUnitTest I would mark these tests as SKIP:

FAIL: DBE_PROPERTY monitor on an ai - value changes generate no events; property changes generate events.
FAIL: Get PV (value) through GW - change HIGH directly - get the DBR_CTRL of the PV through GW
FAIL: Monitor PV (value events) through GW - change HIGH directly - get the DBR_CTRL of the PV through GW

Hmm, when I run nosetests manually in the pyTestsApp directory, pyepics can't find libca.so at all. I think make is setting the EPICS_BASE environment variable which is sufficient for pyepics to work. You should probably mention the need to set EPICS_BASE in the testTop/README.

Makefile issues:

If I use 'make runtest' it re-runs the tests (on the host, using the host binaries) for every cross-target architecture I have Base configured to build. The Makefile should probably use "ifeq ($(T_A),$(EPICS_HOST_ARCH))" instead of "ifdef T_A".

Please use $(INSTALL) or even $(CP) instead of install, which is not portable. The final argument to $(INSTALL) must be the directory name to install into though, not the target filename.

Your build is doing installations of the .py files at 'make runtests' time, not during the initial 'make'. That works, but you might want to put them in TESTSCRIPTS_HOST instead of your own PYTESTS variable and then they will be installed automatically at 'make' time (you do still need the %.py: pattern rule though). That seems to partially fix the issue that 'make clean' doesn't work from inside the O.<host> directory.

I don't understand your comment in the Makefile about making stuff "go through common dir".

[Ralph Lange (ralph-lange)]

> I don't understand your comment in the Makefile about making stuff "go through
> common dir".

In EPICS 3.15, I can do

    %.db: ../%.db
        $(INSTALL) -m 644 $< .
    myTest.py: test.db

and the test database will be copied from .. to the O.<arch> where it is needed.

The EPICS 3.14 build system extensively uses VPATH, and the above simple rule does not work. Make creates circular dependencies (you experienced that, see your above comments) because .. being in the VPATH makes %.db equivalent to ../%.db - no matter how you try, make will never do the obvious.

The only ways out are either installing in a non-VPATH directory first, then into O.<arch> - that's what I meant by "making stuff go through common dir" - or renaming the files in-between (so that VPATH does not apply).

[lp:~epics-core/epics-gateway/dbe_props]

241. By Ralph Lange on 2015-07-02

test: fix formatter parameters to work with python < 2.7

242. By Ralph Lange on 2015-07-02

test: add environment overrides for IOC

243. By Ralph Lange on 2015-07-02

test: always write directly to IOC, prefer pyepics wait instead of time.sleep()

244. By Ralph Lange on 2015-07-02

test: fix make rules to build, run host-only and clean up properly with 3.14 and 3.15

245. By Ralph Lange on 2015-07-02

test: make property tests work with 3.14 and 3.15 IOCs

[Ralph Lange (ralph-lange)]

All taken care of:

I did find a slightly easier way to have make install the extra files.
All commands in recipes use the EPICS build system variables.
Tests are run only on EPICS_HOST_ARCH.

The failing property tests needed a broader fix: the expected results depend on what Base version the IOC is built with, and are independent from the Gateway's Base version (which is the current value of EPICS_BASE when tests are run). I had to change the tests and have them probe the IOC for DBE_PROPERTY support as part of the test setup. A Gateway compiled against 3.14 perfectly passes the full tests if run against a 3.15 IOC.

Thanks a lot for your help and reviewing effort!
One more time, please....

[Andrew Johnson (anj)]

Works for me now, thanks!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-07-30 13:33:03 +0000
+++ .bzrignore	2015-07-02 13:38:28 +0000
@@ -7,3 +7,6 @@
 ./templates
 **/O.*
 ./QtC-*
+# Gateway generated scriptlets
+gateway.killer
+gateway.restart

=== modified file 'src/gatePv.cc'
--- src/gatePv.cc	2015-06-19 13:37:26 +0000
+++ src/gatePv.cc	2015-07-02 13:38:28 +0000
@@ -96,6 +96,9 @@
 	extern void logEventCB(EVENT_ARGS args) {        // log event callback
 		gatePvData::logEventCB(args);
 	}	
+	extern void propEventCB(EVENT_ARGS args) {        // prop event callback
+		gatePvData::propEventCB(args);
+	}	
 }
 
 // quick access to global_resources
@@ -195,6 +198,9 @@
 	value_alarm_mask|=(mrg->valueEventMask()|mrg->alarmEventMask());
 	value_log_mask|=(mrg->valueEventMask()|mrg->logEventMask());
 	value_mask|=mrg->valueEventMask();
+
+
+    prop_get_state = 1;
 }
 
 gatePvData::~gatePvData(void)
@@ -236,6 +242,7 @@
 	}
 	unmonitor();
 	logUnmonitor();
+	propUnmonitor();
 	alhUnmonitor();
 	status=ca_clear_channel(chID);
 	if(status != ECA_NORMAL) {
@@ -267,6 +274,7 @@
 	status=0;
 	markNotMonitored();
 	markLogNotMonitored();
+	markPropNotMonitored();
 	markNoCtrlGetPending();
 	markNoTimeGetPending();
 	markAlhNotMonitored();
@@ -396,8 +404,8 @@
 		}
 		else{
 			markAddRemoveNeeded();
-			if(ca_read_access(chID)) rc=get(ctrlType);
-			else rc=0;
+            if (ca_read_access(chID)) rc = get(ctrlType);
+            else rc = 0;
 		}
 		break;
 	case gatePvDisconnect:
@@ -431,6 +439,7 @@
 		gateDebug1(10,"gatePvData::deactivate() %s PV\n",getStateName());
 		unmonitor();
 		logUnmonitor();
+		propUnmonitor();
 		alhUnmonitor();
 		setState(gatePvInactive);
 #ifdef STAT_PVS
@@ -653,6 +662,7 @@
 	markNoTimeGetPending();
 	unmonitor();
 	logUnmonitor();
+	propUnmonitor();
 	alhUnmonitor();
 
 	return rc;
@@ -724,6 +734,41 @@
 	return rc;
 }
 
+int gatePvData::propUnmonitor(void)
+{
+	gateDebug1(5,"gatePvData::propUnmonitor() name=%s\n",name());
+	int rc=0;
+
+	if(propMonitored())
+	{
+#ifdef USE_313
+		rc=ca_clear_event(propID);
+		if(rc != ECA_NORMAL) {
+			fprintf(stderr,"%s gatePvData::propUnmonitor: ca_clear_event failed "
+			  "for %s:\n"
+			  " %s\n",
+			  timeStamp(),name()?name():"Unknown",ca_message(rc));
+		} else {
+			rc=0;
+		}
+#else
+		rc=ca_clear_subscription(propID);
+		if(rc != ECA_NORMAL) {
+			fprintf(stderr,"%s gatePvData::propUnmonitor: ca_clear_subscription failed "
+			  "for %s:\n"
+			  " %s\n",
+			  timeStamp(),name()?name():"Unknown",ca_message(rc));
+		} else {
+			rc=0;
+		}
+#endif
+		markPropNotMonitored();
+	}
+	return rc;
+}
+
+
+
 int gatePvData::alhUnmonitor(void)
 {
 	gateDebug1(5,"gatePvData::alhUnmonitor() name=%s\n",name());
@@ -881,6 +926,68 @@
 	return rc;
 }
 
+int gatePvData::propMonitor(void)
+{
+    gateDebug1(5,"gatePvData::propMonitor() name=%s\n",name());
+    int rc=0;
+
+#if DEBUG_DELAY
+    if(!strncmp("Xorbit",name(),6)) {
+        printf("%s gatePvData::propMonitor: %s state=%d\n",timeStamp(),name(),
+          getState());
+    }
+#endif
+
+    if(!propMonitored())
+    {
+        // gets only 1 element:
+        // rc=ca_add_event(eventType(),chID,eventCB,this,&event);
+        // gets native element count number of elements:
+
+        if(ca_read_access(chID)) {
+            gateDebug1(5,"gatePvData::propMonitor() type=%ld\n",dataType());
+#ifdef USE_313
+            rc=ca_add_masked_array_event(dataType(),0,chID,::propEventCB,this,
+              0.0,0.0,0.0,&propID,DBE_PROPERTY);
+            if(rc != ECA_NORMAL) {
+                fprintf(stderr,"%s gatePvData::propMonitor: "
+                  "ca_add_masked_array_event failed for %s:\n"
+                  " %s\n",
+                  timeStamp(),name()?name():"Unknown",ca_message(rc));
+                rc=-1;
+            } else {
+                rc=0;
+               markpropMonitored();
+#if OMIT_CHECK_EVENT
+#else
+                checkEvent();
+#endif
+            }
+#else
+            rc=ca_create_subscription(dataType(),0,chID,DBE_PROPERTY,
+              ::propEventCB,this,&propID);
+            if(rc != ECA_NORMAL) {
+                fprintf(stderr,"%s gatePvData::propMonitor: "
+                  "ca_create_subscription failed for %s:\n"
+                  " %s\n",
+                  timeStamp(),name()?name():"Unknown",ca_message(rc));
+                rc=-1;
+            } else {
+                rc=0;
+                markPropMonitored();
+#if OMIT_CHECK_EVENT
+#else
+                checkEvent();
+#endif
+            }
+#endif
+        } else {
+            rc=-1;
+        }
+    }
+    return rc;
+}
+
 int gatePvData::alhMonitor(void)
 {
 	gateDebug1(5,"gatePvData::alhMonitor() name=%s\n",name());
@@ -948,7 +1055,7 @@
 		if(global_resources->getCacheMode()) /* caching enabled */
 		{
 			if(!pendingCtrlGet()) {
-				gateDebug0(3,"gatePvData::get() doing ca_array_get_callback\n");
+                gateDebug1(3,"gatePvData::get() CACHE doing ca_array_get_callback of type CTRL (%ld)\n",dataType());
 				setTransTime();
 				markCtrlGetPending();				
 				rc=ca_array_get_callback(dataType(), 1/*totalElements()*/,
@@ -969,7 +1076,7 @@
 				if(!pendingCtrlGet()) {
 					/*check if array is longer than available memory*/
 					if(global_resources->getMaxBytes() >= (unsigned long)(bytes*totalElements()+sizeof(caHdr) + 2 * sizeof ( ca_uint32_t ))){
-						gateDebug0(3,"gatePvData::get() doing ca_array_get_callback of type CTRL\n");
+                        gateDebug1(3,"gatePvData::get() NO_CACHE doing ca_array_get_callback of type CTRL (%ld)\n",dataType());
 						setTransTime();
 						markCtrlGetPending();				
                         rc = ca_array_get_callback(dataType(), 0, chID, ::getCB, this);
@@ -993,7 +1100,7 @@
 				if(!pendingTimeGet()) {
 					/*check if array is longer than available memory*/
 					if(global_resources->getMaxBytes() >= (unsigned long)(bytes*totalElements()+sizeof(caHdr) + 2 * sizeof ( ca_uint32_t ))){
-						gateDebug0(3,"gatePvData::get() doing ca_array_get_callback of type TIME\n");
+                        gateDebug1(3,"gatePvData::get() NO_CACHE doing ca_array_get_callback of type TIME (%ld)\n", eventType());
 						setTransTime();
 						markTimeGetPending();	
                         rc = ca_array_get_callback(eventType(), 0, chID, ::getTimeCB, this);
@@ -1063,7 +1170,7 @@
 
 #if DEBUG_GDD
 	printf("gatePvData::put(%s): at=%d pt=%d dbr=%ld ft=%ld[%s] name=%s\n",
-		   sPutCallback?"callback":"nocallback",
+           pWIO?"callback":"nocallback",
 		   dd.applicationType(),
 		   dd.primitiveType(),
 		   cht,
@@ -1544,6 +1651,75 @@
 	}
 }
 
+void gatePvData::propEventCB(EVENT_ARGS args)
+{
+    gatePvData* pv=(gatePvData*)ca_puser(args.chid);
+    gateDebug3(5,"gatePvData::propEventCB(gatePvData=%p)(gateVCData=%p) type=%d\n",
+      (void *)pv, (void*)pv->vc, (unsigned int)args.type);
+    gdd* dd;
+
+#ifdef RATE_STATS
+    ++pv->mrg->client_event_count;
+#endif
+
+#if DEBUG_BEAM
+    printf("gatePvData::propEventCB(): status=%d %s\n",
+      args.status,
+      pv->name());
+#endif
+
+#if DEBUG_DELAY
+    if(!strncmp("Xorbit",pv->name(),6)) {
+        printf("%s gatePvData::propEventCB: %s state=%d\n",timeStamp(),pv->name(),
+          pv->getState());
+    }
+#endif
+
+    if(args.status==ECA_NORMAL)
+    {
+        // only sends event_data and does ADD transactions
+        if(pv->active())
+        {
+            gateDebug2(5,"gatePvData::propEventCB() %s PV %d\n",pv->getStateName(), pv->propGetPending());
+            if(pv->propGetPending()) { 
+                gateDebug1(5,"gatePvData::propEventCB() Ignore first event %s PV\n",pv->getStateName());
+                pv->markPropNoGetPending();
+                return;
+            }
+
+            if ((dd = pv->runDataCB(&args)))  // Create the attributes gdd
+            {
+#if DEBUG_BEAM
+                printf("  dd=%p needAddRemove=%d\n", dd, pv->needAddRemove());
+#endif
+                // Update attribute cache
+                pv->vc->setPvData(dd);
+            }
+
+            if ((dd = pv->runValueDataCB(&args)))  // Create the value gdd
+            {
+#if DEBUG_BEAM
+                printf("  dd=%p needAddRemove=%d\n", dd, pv->needAddRemove());
+#endif
+                pv->vc->setEventData(dd);
+
+                if (pv->needAddRemove())
+                {
+                    gateDebug0(5,"gatePvData::propEventCB() need add/remove\n");
+                    pv->markAddRemoveNotNeeded();
+                    pv->vc->vcAdd(ctrlType);
+                }
+                else
+                {
+                    // Post the event
+                    pv->vc->vcPostEvent(pv->mrg->propertyEventMask());
+                }
+            }
+        }
+        ++(pv->event_count);
+    }
+}
+
 
 // This is the callback registered with ca_add_subscription in the
 // alhMonitor routine.  If conditions are right, it calls the routines
@@ -1595,109 +1771,91 @@
 
 void gatePvData::getCB(EVENT_ARGS args)
 {
-	gatePvData* pv=(gatePvData*)ca_puser(args.chid);
-	gateDebug1(5,"gatePvData::getCB(gatePvData=%p)\n",(void *)pv);
-	gdd* dd;
-	readType read_type = ctrlType;
+    gatePvData* pv=(gatePvData*)ca_puser(args.chid);
+    gateDebug1(5,"gatePvData::getCB(gatePvData=%p)\n",(void *)pv);
+    gdd* dd;
+    readType read_type = ctrlType;
 
 
 #ifdef RATE_STATS
-	++pv->mrg->client_event_count;
+    ++pv->mrg->client_event_count;
 #endif
 
 #if DEBUG_ENUM
-	printf("gatePvData::getCB\n");
+    printf("gatePvData::getCB\n");
 #endif
 
 #if DEBUG_DELAY
-	if(!strncmp("Xorbit",pv->name(),6)) {
-		printf("%s gatePvData::getCB: %s state=%d\n",timeStamp(),pv->name(),
-		  pv->getState());
-	}
+    if(!strncmp("Xorbit",pv->name(),6)) {
+        printf("%s gatePvData::getCB: %s state=%d\n",timeStamp(),pv->name(),
+               pv->getState());
+    }
 #endif
 
 
-	pv->markNoCtrlGetPending();
-	if(args.status==ECA_NORMAL)
-	{
-
-		if(pv->active())
-		{
-			gateDebug1(5,"gatePvData::getCB() %s PV\n",pv->getStateName());
+    pv->markNoCtrlGetPending();
+    if (pv->active()) {
+        if (args.status == ECA_NORMAL) {
+            gateDebug1(5,"gatePvData::getCB() %s PV\n",pv->getStateName());
+            // Update property cache with received property data
             dd = pv->runDataCB(&args);
             if (dd)
                 pv->vc->setPvData(dd);
-			
-			if(!global_resources->getCacheMode()) //we must set also value if only ctrl was requested from client
-			{
+        }
+
+        if (global_resources->getCacheMode()) {
+
+            // CACHING mode
+
+            gateDebug0(5,"gatePvData::getCB() [CACHE] Enable value monitor\n");
+            pv->monitor();
+            gateDebug0(5,"gatePvData::getCB() [CACHE] Enable property monitor\n");
+            pv->propMonitor();
+
+            if (pv->vc->needPosting() &&  // enable archive monitor only if in archive mode and requested
+                    global_resources->getArchiveMode() &&
+                    (pv->vc->client_mask == DBE_LOG)) {
+                gateDebug0(5,"gatePvData::getCB() [CACHE] Enable log monitor\n");
+                pv->logMonitor();
+            }
+
+        } else {
+
+            // NO CACHING mode
+
+            if (args.status == ECA_NORMAL) {
+                // Update value cache with received data
                 dd = pv->runValueDataCB(&args);
                 if (dd)
                     pv->vc->setEventData(dd);
-				
-				if(pv->needAddRemove() && !pv->vc->needPosting())
-				{
-					gateDebug0(5,"gatePvData::getCB() need add/remove\n");
-					pv->markAddRemoveNotNeeded();
-					pv->vc->vcAdd(read_type);
-				}
-				else
-					pv->vc->vcData(read_type);				
-				
-				if(pv->vc->needPosting() && !pv->monitored()) // do monitor only if requested
-				{
-					pv->monitor();
-
-				}
-				
-				if(pv->vc->needPosting() &&  // do archive monitor only if requested
-				   global_resources->getArchiveMode() &&
-				   !pv->logMonitored() &&
-				   (pv->vc->client_mask == DBE_LOG)) pv->logMonitor();	
-															
-			}
-			else
-			{
-				pv->monitor();//chacing enabled
-				
-				if(pv->vc->needPosting() &&  // do archive monitor only if requested
-				   global_resources->getArchiveMode() &&
-				   !pv->logMonitored() &&
-				   (pv->vc->client_mask == DBE_LOG)) pv->logMonitor();		 
-			}
-
-		}
-	}
-	else
-	{
-		// problems with the PV if status code not normal - attempt monitor
-		// should check if Monitor() fails and send remove trans if
-		// needed
-		if(pv->active())
-		{
-			if(global_resources->getCacheMode())//chacing enabled
-			{
-				pv->monitor();
-				if(pv->vc->needPosting() &&  // do archive monitor only if requested
-				   global_resources->getArchiveMode() &&
-				   !pv->logMonitored() &&
-				   (pv->vc->client_mask == DBE_LOG)) pv->logMonitor();	
-			}
-			else
-			{
-				if(pv->vc->needPosting())
-				{
-					pv->monitor();
-				}
-				
-				if(pv->vc->needPosting() &&  // do archive monitor only if requested
-				   global_resources->getArchiveMode() &&
-				   !pv->logMonitored() &&
-				   (pv->vc->client_mask == DBE_LOG)) pv->logMonitor();		
-									
-			}
-		}
-			
-	}
+            }
+
+            if (pv->needAddRemove() && !pv->vc->needPosting()) {
+                gateDebug0(5,"gatePvData::getCB() need add/remove\n");
+                pv->markAddRemoveNotNeeded();
+                pv->vc->vcAdd(read_type);
+            } else
+                pv->vc->vcData(read_type);
+
+            if (pv->vc->needPosting()) {  // enable monitor only if requested
+                gateDebug0(5,"gatePvData::getCB() [NO_CACHE] Enable value monitor\n");
+                pv->monitor();
+            }
+
+            if (pv->vc->needPosting() &&  // enable archive monitor only if in achive mode and requested
+                    global_resources->getArchiveMode() &&
+                    (pv->vc->client_mask == DBE_LOG)) {
+                gateDebug0(5,"gatePvData::getCB() [NO_CACHE] Enable log monitor\n");
+                pv->logMonitor();
+            }
+
+            if (pv->vc->needPosting() &&  // enable property monitor only if requested
+                    (pv->vc->client_mask == DBE_PROPERTY)) {
+                gateDebug0(5,"gatePvData::getCB() [NO_CACHE] Enable property monitor\n");
+                pv->propMonitor();
+            }
+        }
+    }
 }
 
 void gatePvData::getTimeCB(EVENT_ARGS args)
@@ -1753,8 +1911,17 @@
 			if(pv->vc->needPosting() &&  // do archive monitor only if requested
 			   global_resources->getArchiveMode() &&
 			   !pv->logMonitored() &&
-			    (pv->vc->client_mask == DBE_LOG)) pv->logMonitor();			
+			    (pv->vc->client_mask == DBE_LOG)) { 
+			        gateDebug0(5,"gatePvData::getCB() Starting log monitor timecb\n");
+                    pv->logMonitor();			
+                }
 
+			if(pv->vc->needPosting() &&  // do property monitor only if requested
+			   !pv->propMonitored() &&
+			    (pv->vc->client_mask == DBE_PROPERTY)) { 
+			        gateDebug0(5,"gatePvData::getCB() Starting prop monitor timecb\n");
+                    pv->propMonitor();			
+                }
 
 		}
 	}
@@ -2132,7 +2299,7 @@
     aitIndex maxCount = totalElements();
 	gdd* value;
 
-	// DBR_TIME_FLOAT response
+    // DBR_TIME_DOUBLE response
 	// set up the value
     if (maxCount > 1)
 	{

=== modified file 'src/gatePv.h'
--- src/gatePv.h	2015-01-29 14:37:40 +0000
+++ src/gatePv.h	2015-07-02 13:38:28 +0000
@@ -117,8 +117,11 @@
 	int pendingTimeGet(void) const { return (time_get_state)?1:0; }
 	int monitored(void) const { return (mon_state)?1:0; }
 	int logMonitored(void) const { return (log_mon_state)?1:0; }	
+	int propMonitored(void) const { return (prop_mon_state)?1:0; }	
 	int alhMonitored(void) const { return (alh_mon_state)?1:0; }
 	int alhGetPending(void) const { return (alh_get_state)?1:0; }
+	int propGetPending(void) const { return (prop_get_state)?1:0; }
+	int logGetPending(void) const { return (log_get_state)?1:0; }
 	int needAddRemove(void) const { return (complete_flag)?1:0; }
 	int abort(void) const { return (abort_flag)?1:0; }
 	
@@ -148,8 +151,10 @@
 	int life(void);                 // set to connected (CAC connect)
 	int monitor(void);              // add monitor
 	int logMonitor(void);           // add log monitor	
+	int propMonitor(void);           // add prop monitor	
 	int unmonitor(void);            // delete monitor
 	int logUnmonitor(void);         // delete log monitor	
+	int propUnmonitor(void);         // delete prop monitor	
 	int alhMonitor(void);           // add alh info monitor
 	int alhUnmonitor(void);         // delete alh info monitor
 	int get(readType read_type);                  // get callback
@@ -174,6 +179,10 @@
 
 	void markAlhGetPending(void) { alh_get_state=1; }
 	void markAlhNoGetPending(void) { alh_get_state=0; }
+	void markPropGetPending(void) { prop_get_state=1; }
+	void markPropNoGetPending(void) { prop_get_state=0; }
+    void markLogGetPending(void) { log_get_state=1; }
+    void markLogNoGetPending(void) { log_get_state=0; }
 	
 	
 protected:
@@ -191,7 +200,9 @@
 	void markMonitored(void) { mon_state=1; }
 	void markNotMonitored(void) { mon_state=0; }
 	void markLogMonitored(void) { log_mon_state=1; }
+	void markPropMonitored(void) { prop_mon_state=1; }
 	void markLogNotMonitored(void) { log_mon_state=0; }		
+	void markPropNotMonitored(void) { prop_mon_state=0; }		
 	void markCtrlGetPending(void) { ctrl_get_state=1; }
 	void markNoCtrlGetPending(void) { ctrl_get_state=0; }
 	void markTimeGetPending(void) { time_get_state=1; }
@@ -221,6 +232,7 @@
 	chid chID;                 // Channel access ID
 	evid evID;                 // Channel access event id
 	evid logID;                 // Channel access event id	
+	evid propID;                 // Channel access event id	
 	evid alhID;                // Channel access alh info event id
 	chtype event_type;         // DBR type associated with eventCB (event_data)
 	chtype data_type;          // DBR type associated with getCB (pv_data)
@@ -234,10 +246,13 @@
 	
 	int mon_state;     // 0=not monitored, 1=is monitored
 	int log_mon_state;     // 0=not log monitored, 1=is log monitored	
+	int prop_mon_state;     // 0=not prop monitored, 1=is prop monitored	
 	int ctrl_get_state;     // 0=no ctrl get pending, 1=ctrl get pending
 	int time_get_state;     // 0=no time get pending, 1=time get pending
 	int alh_mon_state; // 0=alh info not monitored, 1=alh info is monitored
 	int alh_get_state; // 0=no alh info get pending, 1=alh info get pending
+	int prop_get_state; // 0=no prop info get pending, 1=prop info get pending
+	int log_get_state; // 0=no log info get pending, 1=log info get pending
 	int abort_flag;	   // true if activate-connect sequence should be aborted
 	int complete_flag; // true if ADD/REMOVE required after completion
 	
@@ -287,6 +302,7 @@
     static void accessCB(ACCESS_ARGS args);     // access security callback
     static void eventCB(EVENT_ARGS args);       // value-changed callback
     static void logEventCB(EVENT_ARGS args);    // value-changed callback
+	static void propEventCB(EVENT_ARGS args);   // value-changed callback	
     static void alhCB(EVENT_ARGS args);         // alh info value-changed callback
     static void putCB(EVENT_ARGS args);         // put callback
     static void getCB(EVENT_ARGS args);         // get callback

=== modified file 'src/gateResources.h'
--- src/gateResources.h	2015-01-23 15:27:48 +0000
+++ src/gateResources.h	2015-07-02 13:38:28 +0000
@@ -86,6 +86,7 @@
 			if (event_mask & DBE_VALUE) strcat(event_mask_string, "v");
 			if (event_mask & DBE_ALARM) strcat(event_mask_string, "a");
 			if (event_mask & DBE_LOG)   strcat(event_mask_string, "l");
+			if (event_mask & DBE_PROPERTY)   strcat(event_mask_string, "p");
 		}
 	unsigned long eventMask(void) const		{ return event_mask; }
 	const char* eventMaskString(void) const	{ return event_mask_string; }

=== modified file 'src/gateServer.cc'
--- src/gateServer.cc	2015-06-19 13:38:25 +0000
+++ src/gateServer.cc	2015-07-02 13:38:28 +0000
@@ -1098,7 +1098,7 @@
 		  " %s\n",timeStamp(),ca_message(status));
 	}
 
-	select_mask|=(alarmEventMask()|valueEventMask()|logEventMask());
+	select_mask|=(alarmEventMask()|valueEventMask()|logEventMask()|propertyEventMask());
 	alh_mask|=alarmEventMask();
 
 	exist_count=0;

=== modified file 'src/gateVc.cc'
--- src/gateVc.cc	2015-01-23 15:27:48 +0000
+++ src/gateVc.cc	2015-07-02 13:38:28 +0000
@@ -357,7 +357,8 @@
 
 	select_mask|=(mrg->alarmEventMask()|
 	  mrg->valueEventMask()|
-	  mrg->logEventMask());
+	  mrg->logEventMask()|
+      mrg->propertyEventMask());
 	alh_mask|=mrg->alarmEventMask();
 	client_mask=0u;
 
@@ -562,7 +563,7 @@
 
 #if DEBUG_GDD
 	heading("gateVcData::setEventData",name());
-	dumpdd(1,"dd (incoming)",name(),dd);
+    dumpdd(1,"dd (new value data)",name(),dd);
 #endif
 
 #if DEBUG_DELAY
@@ -751,6 +752,11 @@
 	// currently
 	gateDebug2(2,"gateVcData::setPvData(gdd=%p) name=%s\n",(void *)dd,name());
 
+#if DEBUG_GDD
+    heading("gateVcData::setPvData",name());
+    dumpdd(1,"dd (new property data)",name(),dd);
+#endif
+
 	if(pv_data) pv_data->unreference();
 	pv_data=dd;
 
@@ -1084,6 +1090,9 @@
 		if (caProtoMask & DBE_LOG) {
 			client_mask = DBE_LOG;
 		}
+		if (caProtoMask & DBE_PROPERTY) {
+			client_mask = DBE_PROPERTY;
+		}
 	}
 
 #if DEBUG_GDD || DEBUG_ENUM
@@ -1168,7 +1177,8 @@
 			return S_casApp_postponeAsyncIO;
 		} else {
 			// Copy the current state into the dd
-			copyState(dd);
+            gateDebug1(10,"gateVcData::read() %s using cached pv data for reply\n",name());
+            copyState(dd);
 		}
 		return S_casApp_success;
 	case gddAppType_value: if(!global_resources->getCacheMode()) read_type = timeType;

=== modified file 'src/gateway.cc'
--- src/gateway.cc	2015-01-29 15:25:02 +0000
+++ src/gateway.cc	2015-07-02 13:38:28 +0000
@@ -760,6 +760,10 @@
 								case 'L' :
 									mask |= DBE_LOG;
 									break;
+								case 'p' :
+								case 'P' :
+									mask |= DBE_PROPERTY;
+									break;
 								default :
 									break;
 								}

=== added file 'testTop/README'
--- testTop/README	1970-01-01 00:00:00 +0000
+++ testTop/README	2015-07-02 13:38:28 +0000
@@ -0,0 +1,56 @@
+README for CA Gateway Tests
+===========================
+
+This is an embedded TOP structure.
+By default, it is being used as part of the CA Gateway sources.
+You can also copy it out of the CA Gateway source tree and use it
+separately. In that case, you will have to set the pointers in
+.../configure/RELEASE appropriately.
+
+pyTestsApp
+----------
+
+Python unit tests.
+Default settings and configuration in the gwtests.py file.
+
+Most of the tests start an EPICS (soft) IOC and a CA Gateway,
+working on different non-standard ports on the 'localhost' loopback interface,
+The Gateway uses an ALIAS directive to export the channels on the IOC using
+a different prefix.
+The test routines, using the pyepics binding, have access to both the IOC and
+the Gateway channels to set up subscriptions, trigger events on the IOC and
+check the resulting event streams through the Gateway.
+
+There are two main ways to run the tests:
+1. As part of the EPICS Build system 'make runtests' and 'make tapfiles'
+   targets:
+   Test files and scripts are copied to the O.<arch> directory,
+   then 'nosetests' is used to run the tests there.
+   The build system sets all necessary environment variables.
+   For 'make tapfiles' the nosetests tap plugin from tap.py is used
+   to create TAP output.
+2. Manually:
+   Test can be run in the pyTestApp directory using the unittest or nosetests
+   wrapper. (E.g. run 'nosetests --exe'.)
+   These wrappers also allow selecting specific tests to run.
+   You might have to set EPICS_BASE, EPICS_HOST_ARCH and TOP (to find the
+   gateway executable under test and the CA libraries).
+
+Environment variables
+VERBOSE          - YES to make tests more verbose
+VERBOSE_GATEWAY  - YES to run the gateway with default debuglevel 10
+                   <debuglevel> for setting a specific debuglevel
+
+IOC environment overrides
+To allow control over the IOC that is being used independently from any
+settings for the Gateway under test, you can specify environment variables
+with an "IOC_" prefix that will be set for the IOC (with the prefix removed).
+E.g.
+IOC_EPICS_BASE=<location> will set EPICS_BASE=<location> for the IOC.
+As this setting is also used to determine the location of the 'softIoc'
+executable, it allows testing against IOCs from different versions of base.
+
+Prerequisite python packages:
+
+tap.py        - Creating TAP output (for 'make tapfiles')
+pyepics (v3)  - Python CA client library

=== modified file 'testTop/configure/RULES'
--- testTop/configure/RULES	2015-01-26 15:44:55 +0000
+++ testTop/configure/RULES	2015-07-02 13:38:28 +0000
@@ -4,3 +4,5 @@
 
 # Library should be rebuilt because LIBOBJS may have changed.
 $(LIBNAME): ../Makefile
+
+TAPFILES += $(TESTSCRIPTS:.py=.tap)

=== added directory 'testTop/pyTestsApp'
=== added file 'testTop/pyTestsApp/GatewayControl.py'
--- testTop/pyTestsApp/GatewayControl.py	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/GatewayControl.py	2015-07-02 13:38:28 +0000
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+'''Controls the CA Gateway'''
+import subprocess
+import time
+import os
+import gwtests
+
+class GatewayControl:
+    gatewayProcess = None
+    DEVNULL = None
+
+    def startGateway(self):
+        '''Starts the CA Gateway'''
+        gateway_commands = [gwtests.gwExecutable]
+        gateway_commands.extend(["-sip", "localhost", "-sport", str(gwtests.gwPort)])
+        gateway_commands.extend(["-cip", "localhost", "-cport", str(gwtests.iocPort)])
+        gateway_commands.extend(["-access", "access.txt", "-pvlist", "pvlist.txt"])
+        gateway_commands.extend(["-archive", "-prefix", gwtests.gwStatsPrefix])
+
+        if gwtests.verboseGateway:
+            gateway_commands.extend(["-debug", str(gwtests.gwDebug)]);
+        if gwtests.verbose:
+            print "Starting the CA Gateway using\n", " ".join(gateway_commands)
+        if not gwtests.verboseGateway and not gwtests.verbose:
+            self.DEVNULL = open(os.devnull, 'wb')
+        self.gatewayProcess = subprocess.Popen(gateway_commands, stdout=self.DEVNULL, stderr=subprocess.STDOUT)
+
+    def stop(self):
+        '''Stops the CA Gateway'''
+        self.gatewayProcess.terminate()
+        if self.DEVNULL:
+            self.DEVNULL.close()
+
+
+if __name__ == "__main__":
+    gwtests.setup()
+    print "Running the test CA Gateway in verbose mode for {0} seconds".format(gwtests.gwRunDuration)
+    gwtests.verbose = True
+    gwtests.verboseGateway = True
+    gatewayControl = GatewayControl()
+    gatewayControl.startGateway()
+    time.sleep(gwtests.gwRunDuration)
+    gatewayControl.stop()

=== added file 'testTop/pyTestsApp/IOCControl.py'
--- testTop/pyTestsApp/IOCControl.py	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/IOCControl.py	2015-07-02 13:38:28 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+'''Controls the test IOC'''
+import os
+import subprocess
+import time
+import gwtests
+
+class IOCControl:
+    iocProcess = None
+    DEVNULL = None
+
+    def startIOC(self, arglist=None):
+        '''Starts the test IOC'''
+        childEnviron = os.environ.copy()
+        childEnviron['EPICS_CA_SERVER_PORT'] = str(gwtests.iocPort)
+        childEnviron['EPICS_CA_ADDR_LIST'] = "localhost"
+        childEnviron['EPICS_CA_AUTO_ADDR_LIST'] = "NO"
+        # IOC_ environment overrides
+        for v in os.environ.keys():
+            if v.startswith("IOC_"):
+                childEnviron[v.replace("IOC_", "", 1)] = os.environ[v]
+
+        if not gwtests.verbose:
+            self.DEVNULL = open(os.devnull, 'wb')
+
+        if arglist is None:
+            iocCommand = [gwtests.iocExecutable, '-d', 'test.db']
+        else:
+            iocCommand = [gwtests.iocExecutable]
+            iocCommand.extend(arglist)
+
+        if gwtests.verbose:
+            print "Starting the IOC using\n", " ".join(iocCommand)
+        self.iocProcess = subprocess.Popen(iocCommand, env=childEnviron,
+                stdin=subprocess.PIPE, stdout=self.DEVNULL, stderr=subprocess.STDOUT)
+        time.sleep(.5)
+
+    def stop(self):
+        '''Stops the test IOC'''
+        self.iocProcess.stdin.close()
+        if self.DEVNULL:
+            self.DEVNULL.close()
+
+
+if __name__ == "__main__":
+    gwtests.setup()
+    print "Running the test IOC in verbose mode for {0} seconds".format(gwtests.gwRunDuration)
+    gwtests.verbose = True
+    iocControl = IOCControl()
+    iocControl.startIOC()
+    time.sleep(gwtests.iocRunDuration)
+    iocControl.stop()

=== added file 'testTop/pyTestsApp/Makefile'
--- testTop/pyTestsApp/Makefile	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/Makefile	2015-07-02 13:38:28 +0000
@@ -0,0 +1,43 @@
+TOP=..
+
+include $(TOP)/configure/CONFIG
+#----------------------------------------
+#  ADD MACRO DEFINITIONS AFTER THIS LINE
+#=============================
+
+TESTSCRIPTS_HOST += gwtests.py TestDBEValue.py TestDBEAlarm.py TestDBELog.py TestDBEProp.py
+TESTSCRIPTS_HOST += TestPropertyCache.py
+TESTSCRIPTS_HOST += IOCControl.py GatewayControl.py
+
+TESTFILES += test.db
+TESTFILES += pvlist.txt access.txt
+
+CLEANS += *.pyc $(TESTFILES) gateway.*
+
+include $(TOP)/configure/RULES
+#----------------------------------------
+#  ADD RULES AFTER THIS LINE
+
+ifeq ($(T_A),$(EPICS_HOST_ARCH))
+
+ifeq ($(BASE_3_14),YES)
+clean::
+	@$(RM) $(CLEANS)
+endif
+
+runtests:
+	nosetests
+
+tapfiles:
+	nosetests --with-tap
+
+%.py: ../%.py
+	$(ECHO) "Copying test script $@"
+	@$(INSTALL) -m $(INSTALL_PERMISSIONS) $< .
+
+# Workaround for 3.14 make rules: special target to avoid circular dependencies
+build runtests: testfiles
+testfiles: $(TESTFILES:%=../%)
+	$(ECHO) "Copying test files $(TESTFILES)"
+	@$(CP) $^ .
+endif

=== added file 'testTop/pyTestsApp/TestDBEAlarm.py'
--- testTop/pyTestsApp/TestDBEAlarm.py	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/TestDBEAlarm.py	2015-07-02 13:38:28 +0000
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+import os
+import unittest
+import epics
+import IOCControl
+import GatewayControl
+import gwtests
+import time
+
+class TestDBEAlarm(unittest.TestCase):
+    '''Test alarm updates (client using DBE_ALARM flag) through the Gateway'''
+
+    def setUp(self):
+        gwtests.setup()
+        self.iocControl = IOCControl.IOCControl()
+        self.gatewayControl = GatewayControl.GatewayControl()
+        self.iocControl.startIOC()
+        self.gatewayControl.startGateway()
+        os.environ["EPICS_CA_AUTO_ADDR_LIST"] = "NO"
+        os.environ["EPICS_CA_ADDR_LIST"] = "localhost:{0} localhost:{1}".format(gwtests.iocPort,gwtests.gwPort)
+        epics.ca.initialize_libca()
+        self.eventsReceived = 0
+        self.severityUnchanged = 0
+        self.lastSeverity = 4
+
+    def tearDown(self):
+        epics.ca.finalize_libca()
+        self.gatewayControl.stop()
+        self.iocControl.stop()
+        
+    def onChange(self, pvname=None, **kws):
+        self.eventsReceived += 1
+        if gwtests.verbose:
+            print pvname, " changed to ", kws['value'], kws['severity']
+        if self.lastSeverity == kws['severity']:
+            self.severityUnchanged += 1
+        self.lastSeverity = kws['severity']
+        
+    def testAlarmLevel(self):
+        '''DBE_ALARM monitor on an ai with two alarm levels - crossing the level generates updates'''
+        # gateway:passiveALRM has HIGH=5 (MINOR) and HIHI=10 (MAJOR)
+        ioc = epics.PV("ioc:passiveALRM", auto_monitor=epics.dbr.DBE_ALARM)
+        gw = epics.PV("gateway:passiveALRM", auto_monitor=epics.dbr.DBE_ALARM)
+        gw.add_callback(self.onChange)
+        ioc.get()
+        gw.get()
+        for val in [0,1,2,3,4,5,6,7,8,9,10,9,8,7,6,5,4,3,2,1,0]:
+            ioc.put(val, wait=True)
+        time.sleep(.05)
+        # We get 6 events: at connection (INVALID), at first write (NO_ALARM),
+        # and at the level crossings MINOR-MAJOR-MINOR-NO_ALARM.
+        self.assertTrue(self.eventsReceived == 6, 'events expected: 6; events received: ' + str(self.eventsReceived))
+        # Any updates with unchanged severity are an error
+        self.assertTrue(self.severityUnchanged == 0, str(self.severityUnchanged) + ' events with no severity changes received')
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)

=== added file 'testTop/pyTestsApp/TestDBELog.py'
--- testTop/pyTestsApp/TestDBELog.py	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/TestDBELog.py	2015-07-02 13:38:28 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+import os
+import unittest
+import epics
+import IOCControl
+import GatewayControl
+import gwtests
+import time
+
+class TestDBELog(unittest.TestCase):
+    '''Test log/archive updates (client using DBE_LOG flag) through the Gateway'''
+
+    def setUp(self):
+        gwtests.setup()
+        self.iocControl = IOCControl.IOCControl()
+        self.gatewayControl = GatewayControl.GatewayControl()
+        self.iocControl.startIOC()
+        self.gatewayControl.startGateway()
+        os.environ["EPICS_CA_AUTO_ADDR_LIST"] = "NO"
+        os.environ["EPICS_CA_ADDR_LIST"] = "localhost:{0} localhost:{1}".format(gwtests.iocPort,gwtests.gwPort)
+        epics.ca.initialize_libca()
+        self.eventsReceived = 0
+        self.diffInsideDeadband = 0
+        self.lastValue = -99.9
+
+    def tearDown(self):
+        epics.ca.finalize_libca()
+        self.gatewayControl.stop()
+        self.iocControl.stop()
+        
+    def onChange(self, pvname=None, **kws):
+        self.eventsReceived += 1
+        if gwtests.verbose:
+            print pvname, " changed to ", kws['value'], kws['severity']
+        if (kws['value'] != 0.0) and (abs(self.lastValue - kws['value']) <= 10.0):
+            self.diffInsideDeadband += 1
+        self.lastValue = kws['value']
+        
+    def testLogDeadband(self):
+        '''DBE_LOG monitor on an ai with an ADEL - leaving the deadband generates events.'''
+        # gateway:passiveADEL has ADEL=10
+        ioc = epics.PV("ioc:passiveADEL", auto_monitor=epics.dbr.DBE_LOG)
+        gw = epics.PV("gateway:passiveADEL", auto_monitor=epics.dbr.DBE_LOG)
+        gw.add_callback(self.onChange)
+        ioc.get()
+        gw.get()
+        for val in range(35):
+            ioc.put(val, wait=True)
+        time.sleep(.05)
+        # We get 5 events: at connection, first put, then at 11 22 33
+        self.assertTrue(self.eventsReceived == 5, 'events expected: 5; events received: ' + str(self.eventsReceived))
+        # Any updates inside deadband are an error
+        self.assertTrue(self.diffInsideDeadband == 0, str(self.diffInsideDeadband) + ' events with change <= deadband received')
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)

=== added file 'testTop/pyTestsApp/TestDBEProp.py'
--- testTop/pyTestsApp/TestDBEProp.py	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/TestDBEProp.py	2015-07-02 13:38:28 +0000
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+import os
+import unittest
+import epics
+import IOCControl
+import GatewayControl
+import gwtests
+import time
+
+class TestDBEProp(unittest.TestCase):
+    '''Test property updates (client using DBE_PROPERTY flag) direct and through the Gateway'''
+
+    def setUp(self):
+        gwtests.setup()
+        self.iocControl = IOCControl.IOCControl()
+        self.gatewayControl = GatewayControl.GatewayControl()
+        self.iocControl.startIOC()
+        self.gatewayControl.startGateway()
+        os.environ["EPICS_CA_AUTO_ADDR_LIST"] = "NO"
+        os.environ["EPICS_CA_ADDR_LIST"] = "localhost:{0} localhost:{1}".format(gwtests.iocPort,gwtests.gwPort)
+        epics.ca.initialize_libca()
+        self.eventsReceivedGW = 0
+        self.eventsReceivedIOC = 0
+
+    def tearDown(self):
+        epics.ca.finalize_libca()
+        self.gatewayControl.stop()
+        self.iocControl.stop()
+        
+    def onChangeGW(self, pvname=None, **kws):
+        self.eventsReceivedGW += 1
+        if gwtests.verbose:
+            print " GW update: ", pvname, " changed to ", kws['value']
+        
+    def onChangeIOC(self, pvname=None, **kws):
+        self.eventsReceivedIOC += 1
+        if gwtests.verbose:
+            print "IOC update: ", pvname, " changed to ", kws['value']
+
+    def testPropAlarmLevels(self):
+        '''DBE_PROPERTY monitor on an ai - value changes generate no events; property changes generate events.'''
+        # gateway:passive0 is a blank ai record
+        ioc = epics.PV("ioc:passive0", auto_monitor=epics.dbr.DBE_PROPERTY)
+        ioc.add_callback(self.onChangeIOC)
+        gw = epics.PV("gateway:passive0", auto_monitor=epics.dbr.DBE_PROPERTY)
+        gw.add_callback(self.onChangeGW)
+        pvhihi = epics.PV("ioc:passive0.HIHI", auto_monitor=None)
+        pvlolo = epics.PV("ioc:passive0.LOLO", auto_monitor=None)
+        pvhigh = epics.PV("ioc:passive0.HIGH", auto_monitor=None)
+        pvlow  = epics.PV("ioc:passive0.LOW",  auto_monitor=None)
+        ioc.get()
+        gw.get()
+
+        for val in range(10):
+            ioc.put(val, wait=True)
+        time.sleep(.05)
+        # We get 1 event: at connection
+        self.assertTrue(self.eventsReceivedGW == 1, 'GW events expected: 1; received: ' + str(self.eventsReceivedGW))
+        self.assertTrue(self.eventsReceivedIOC == 1, 'IOC events expected: 1; received: ' + str(self.eventsReceivedIOC))
+
+        self.eventsReceived = 0
+        pvhihi.put(20.0, wait=True)
+        pvhigh.put(18.0, wait=True)
+        pvlolo.put(10.0, wait=True)
+        pvlow.put(12.0, wait=True)
+        time.sleep(.05)
+
+        # Depending on the IOC (supporting PROPERTY changes on limits or not) we get 0 or 4 events.
+        # Pass test if updates from IOC act the same as updates from GW
+        self.assertTrue(self.eventsReceivedGW == self.eventsReceivedIOC,
+            "Expected equal number of updates; received {0} from GW and {1} from IOC".format(self.eventsReceivedGW, self.eventsReceivedIOC))
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)

=== added file 'testTop/pyTestsApp/TestDBEValue.py'
--- testTop/pyTestsApp/TestDBEValue.py	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/TestDBEValue.py	2015-07-02 13:38:28 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+import os
+import unittest
+import epics
+import IOCControl
+import GatewayControl
+import gwtests
+import time
+
+class TestDBEValue(unittest.TestCase):
+    '''Test value updates (client using DBE_VALUE flag) through the Gateway'''
+
+    def setUp(self):
+        gwtests.setup()
+        self.iocControl = IOCControl.IOCControl()
+        self.gatewayControl = GatewayControl.GatewayControl()
+        self.iocControl.startIOC()
+        self.gatewayControl.startGateway()
+        os.environ["EPICS_CA_AUTO_ADDR_LIST"] = "NO"
+        os.environ["EPICS_CA_ADDR_LIST"] = "localhost:{0} localhost:{1}".format(gwtests.iocPort,gwtests.gwPort)
+        epics.ca.initialize_libca()
+        self.eventsReceived = 0
+
+    def tearDown(self):
+        epics.ca.finalize_libca()
+        self.gatewayControl.stop()
+        self.iocControl.stop()
+        
+    def onChange(self, pvname=None, **kws):
+        self.eventsReceived += 1
+        if gwtests.verbose:
+            print pvname, " changed to ", kws['value']
+        
+    def testValueNoDeadband(self):
+        '''DBE_VALUE monitor on an ai - value changes generate events.'''
+        # gateway:passive0 is a blank ai record
+        ioc = epics.PV("ioc:passive0", auto_monitor=epics.dbr.DBE_VALUE)
+        gw = epics.PV("gateway:passive0", auto_monitor=epics.dbr.DBE_VALUE)
+        gw.add_callback(self.onChange)
+        ioc.get()
+        gw.get()
+
+        for val in range(10):
+            ioc.put(val, wait=True)
+        time.sleep(.05)
+
+        # We get 11 events: at connection, then at 10 value changes (puts)
+        self.assertTrue(self.eventsReceived == 11, 'events expected: 11; events received: ' + str(self.eventsReceived))
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)

=== added file 'testTop/pyTestsApp/TestPropertyCache.py'
--- testTop/pyTestsApp/TestPropertyCache.py	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/TestPropertyCache.py	2015-07-02 13:38:28 +0000
@@ -0,0 +1,289 @@
+#!/usr/bin/env python
+import os
+import unittest
+import epics
+from epics import ca, dbr
+import IOCControl
+import GatewayControl
+import gwtests
+import time
+import subprocess
+
+class TestPropertyCache(unittest.TestCase):
+    '''Testing the Gateway PV property cache
+    Set up a connection through the Gateway - change a property externally - check if Gateway cache was updated
+    '''
+
+    def setUp(self):
+        gwtests.setup()
+        self.iocControl = IOCControl.IOCControl()
+        self.gatewayControl = GatewayControl.GatewayControl()
+        self.iocControl.startIOC()
+        self.gatewayControl.startGateway()
+        self.propSupported = False
+        os.environ["EPICS_CA_AUTO_ADDR_LIST"] = "NO"
+        os.environ["EPICS_CA_ADDR_LIST"] = "localhost:{0} localhost:{1}".format(gwtests.iocPort,gwtests.gwPort)
+        ca.initialize_libca()
+
+        # Check if IOC supports DBE_PROPERTY
+        self.eventsReceivedIOC = 0
+        ioc = epics.PV("ioc:passive0", auto_monitor=epics.dbr.DBE_PROPERTY)
+        ioc.add_callback(self.onChangeIOC)
+        ioc.get()
+        pvhigh = epics.PV("ioc:passive0.HIGH", auto_monitor=None)
+        pvhigh.put(18.0, wait=True)
+        time.sleep(.05)
+        if self.eventsReceivedIOC == 2:
+            self.propSupported = True
+
+    def tearDown(self):
+        ca.finalize_libca()
+        self.gatewayControl.stop()
+        self.iocControl.stop()
+
+    def onChangeIOC(self, pvname=None, **kws):
+        self.eventsReceivedIOC += 1
+
+    def onChange(self, pvname=None, **kws):
+        a = 1
+
+
+    def testPropCache_ValueMonitorCTRLget(self):
+        '''Monitor PV (value events) through GW - change HIGH directly - get the DBR_CTRL of the PV through GW'''
+        gw_vctotal = ca.create_channel("gwtest:vctotal")
+        gw_pvtotal = ca.create_channel("gwtest:pvtotal")
+        gw_connected = ca.create_channel("gwtest:connected")
+        gw_active = ca.create_channel("gwtest:active")
+        gw_inactive = ca.create_channel("gwtest:inactive")
+
+        # gateway should show no VC (client side connection) and no PV (IOC side connection)
+        count = ca.get(gw_vctotal)
+        self.assertTrue(count == 0, "Expected GW VC total count: 0, actual: " + str(count))
+        count = ca.get(gw_pvtotal)
+        self.assertTrue(count == 0, "Expected GW PV total count: 0, actual: " + str(count))
+        count = ca.get(gw_connected)
+        self.assertTrue(count == 0, "Expected GW connected PV count: 0, actual: " + str(count))
+        count = ca.get(gw_active)
+        self.assertTrue(count == 0, "Expected GW active PV count: 0, actual: " + str(count))
+        count = ca.get(gw_inactive)
+        self.assertTrue(count == 0, "Expected GW inactive PV count: 0, actual: " + str(count))
+
+        # gwcachetest is an ai record with full set of alarm limits: -100 -10 10 100
+        gw = ca.create_channel("gateway:gwcachetest")
+        connected = ca.connect_channel(gw, timeout=.5)
+        self.assertTrue(connected, "Could not connect to gateway channel " + ca.name(gw))
+        (gw_cbref, gw_uaref, gw_eventid) = ca.create_subscription(gw, mask=dbr.DBE_VALUE, callback=self.onChange)
+        ioc = ca.create_channel("ioc:gwcachetest")
+        connected = ca.connect_channel(ioc, timeout=.5)
+        self.assertTrue(connected, "Could not connect to ioc channel " + ca.name(gw))
+        (ioc_cbref, ioc_uaref, ioc_eventid) = ca.create_subscription(ioc, mask=dbr.DBE_VALUE, callback=self.onChange)
+
+        # gateway should show one VC and one connected active PV
+        count = ca.get(gw_vctotal)
+        self.assertTrue(count == 1, "Expected GW VC total count: 1, actual: " + str(count))
+        count = ca.get(gw_pvtotal)
+        self.assertTrue(count == 1, "Expected GW PV total count: 1, actual: " + str(count))
+        count = ca.get(gw_connected)
+        self.assertTrue(count == 1, "Expected GW connected PV count: 1, actual: " + str(count))
+        count = ca.get(gw_active)
+        self.assertTrue(count == 1, "Expected GW active PV count: 1, actual: " + str(count))
+        count = ca.get(gw_inactive)
+        self.assertTrue(count == 0, "Expected GW inactive PV count: 0, actual: " + str(count))
+
+        # limit should not have been updated
+        ioc_ctrl = ca.get_ctrlvars(ioc)
+        highVal = ioc_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 10.0, "Expected IOC warning_limit: 10; actual limit: "+ str(highVal))
+        gw_ctrl = ca.get_ctrlvars(gw)
+        highVal = gw_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 10.0, "Expected GW warning_limit: 10; actual limit: "+ str(highVal))
+
+        # set warning limit on IOC
+        ioc_high = ca.create_channel("ioc:gwcachetest.HIGH")
+        ca.put(ioc_high, 20.0, wait=True)
+        time.sleep(.1)
+
+        # Now the limit should have been updated (if IOC supports DBE_PROPERTY)
+        ioc_ctrl = ca.get_ctrlvars(ioc)
+        highVal = ioc_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 20.0, "Expected IOC warning_limit: 20; actual limit: "+ str(highVal))
+        if self.propSupported:
+            gw_expected = 20.0
+        else:
+            gw_expected = 10.0
+        gw_ctrl = ca.get_ctrlvars(gw)
+        highVal = gw_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == gw_expected, "Expected GW warning_limit: {0}; actual limit: {1}".format(gw_expected, highVal))
+
+
+    def testPropCache_ValueGetCTRLGet(self):
+        '''Get PV (value) through GW - change HIGH directly - get the DBR_CTRL of the PV through GW'''
+        gw_vctotal = ca.create_channel("gwtest:vctotal")
+        gw_pvtotal = ca.create_channel("gwtest:pvtotal")
+        gw_connected = ca.create_channel("gwtest:connected")
+        gw_active = ca.create_channel("gwtest:active")
+        gw_inactive = ca.create_channel("gwtest:inactive")
+
+        # gateway should show no VC (client side connection) and no PV (IOC side connection)
+        count = ca.get(gw_vctotal)
+        self.assertTrue(count == 0, "Expected GW VC total count: 0, actual: " + str(count))
+        count = ca.get(gw_pvtotal)
+        self.assertTrue(count == 0, "Expected GW PV total count: 0, actual: " + str(count))
+        count = ca.get(gw_connected)
+        self.assertTrue(count == 0, "Expected GW connected PV count: 0, actual: " + str(count))
+        count = ca.get(gw_active)
+        self.assertTrue(count == 0, "Expected GW active PV count: 0, actual: " + str(count))
+        count = ca.get(gw_inactive)
+        self.assertTrue(count == 0, "Expected GW inactive PV count: 0, actual: " + str(count))
+
+        # gwcachetest is an ai record with full set of alarm limits: -100 -10 10 100
+        gw = ca.create_channel("gateway:gwcachetest")
+        connected = ca.connect_channel(gw, timeout=.5)
+        self.assertTrue(connected, "Could not connect to gateway channel " + ca.name(gw))
+        ioc = ca.create_channel("ioc:gwcachetest")
+        connected = ca.connect_channel(ioc, timeout=.5)
+        self.assertTrue(connected, "Could not connect to ioc channel " + ca.name(gw))
+
+        # gateway should show one VC and one connected active PV
+        count = ca.get(gw_vctotal)
+        self.assertTrue(count == 1, "Expected GW VC total count: 0, actual: " + str(count))
+        count = ca.get(gw_pvtotal)
+        self.assertTrue(count == 1, "Expected GW PV total count: 1, actual: " + str(count))
+        count = ca.get(gw_connected)
+        self.assertTrue(count == 1, "Expected GW connected PV count: 1, actual: " + str(count))
+        count = ca.get(gw_active)
+        self.assertTrue(count == 1, "Expected GW active PV count: 1, actual: " + str(count))
+        count = ca.get(gw_inactive)
+        self.assertTrue(count == 0, "Expected GW inactive PV count: 0, actual: " + str(count))
+
+        # limit should not have been updated
+        ioc_ctrl = ca.get_ctrlvars(ioc)
+        highVal = ioc_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 10.0, "Expected IOC warning_limit: 10; actual limit: "+ str(highVal))
+        gw_ctrl = ca.get_ctrlvars(gw)
+        highVal = gw_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 10.0, "Expected GW warning_limit: 10; actual limit: "+ str(highVal))
+
+        # set warning limit on IOC
+        ioc_high = ca.create_channel("ioc:gwcachetest.HIGH")
+        ca.put(ioc_high, 20.0, wait=True)
+        time.sleep(.1)
+
+        # Now the limit should have been updated (if IOC supports DBE_PROPERTY)
+        ioc_ctrl = ca.get_ctrlvars(ioc)
+        highVal = ioc_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 20.0, "Expected IOC warning_limit: 20; actual limit: "+ str(highVal))
+        if self.propSupported:
+            gw_expected = 20.0
+        else:
+            gw_expected = 10.0
+        gw_ctrl = ca.get_ctrlvars(gw)
+        highVal = gw_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == gw_expected, "Expected GW warning_limit: {0}; actual limit: {1}".format(gw_expected, highVal))
+
+
+    def testPropCache_ValueGetDisconnectCTRLGet(self):
+        '''Get PV (value) through GW - disconnect client - change HIGH directly - get the DBR_CTRL of the PV through GW'''
+        gw_vctotal = ca.create_channel("gwtest:vctotal")
+        gw_pvtotal = ca.create_channel("gwtest:pvtotal")
+        gw_connected = ca.create_channel("gwtest:connected")
+        gw_active = ca.create_channel("gwtest:active")
+        gw_inactive = ca.create_channel("gwtest:inactive")
+
+        # gateway should show no VC (client side connection) and no PV (IOC side connection)
+        count = ca.get(gw_vctotal)
+        self.assertTrue(count == 0, "Expected GW VC total count: 0, actual: " + str(count))
+        count = ca.get(gw_pvtotal)
+        self.assertTrue(count == 0, "Expected GW PV total count: 0, actual: " + str(count))
+        count = ca.get(gw_connected)
+        self.assertTrue(count == 0, "Expected GW connected PV count: 0, actual: " + str(count))
+        count = ca.get(gw_active)
+        self.assertTrue(count == 0, "Expected GW active PV count: 0, actual: " + str(count))
+        count = ca.get(gw_inactive)
+        self.assertTrue(count == 0, "Expected GW inactive PV count: 0, actual: " + str(count))
+
+        # gwcachetest is an ai record with full set of alarm limits: -100 -10 10 100
+        gw = ca.create_channel("gateway:gwcachetest")
+        connected = ca.connect_channel(gw, timeout=.5)
+        self.assertTrue(connected, "Could not connect to gateway channel " + ca.name(gw))
+        ioc = ca.create_channel("ioc:gwcachetest")
+        connected = ca.connect_channel(ioc, timeout=.5)
+        self.assertTrue(connected, "Could not connect to ioc channel " + ca.name(gw))
+
+        # gateway should show one VC and one connected active PV
+        count = ca.get(gw_vctotal)
+        self.assertTrue(count == 1, "Expected GW VC total count: 1, actual: " + str(count))
+        count = ca.get(gw_pvtotal)
+        self.assertTrue(count == 1, "Expected GW PV total count: 1, actual: " + str(count))
+        count = ca.get(gw_connected)
+        self.assertTrue(count == 1, "Expected GW connected PV count: 1, actual: " + str(count))
+        count = ca.get(gw_active)
+        self.assertTrue(count == 1, "Expected GW active PV count: 1, actual: " + str(count))
+        count = ca.get(gw_inactive)
+        self.assertTrue(count == 0, "Expected GW inactive PV count: 0, actual: " + str(count))
+
+        # limit should not have been updated
+        ioc_ctrl = ca.get_ctrlvars(ioc)
+        highVal = ioc_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 10.0, "Expected IOC warning_limit: 10; actual limit: "+ str(highVal))
+        gw_ctrl = ca.get_ctrlvars(gw)
+        highVal = gw_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 10.0, "Expected GW warning_limit: 10; actual limit: "+ str(highVal))
+
+        # disconnect Channel Access, reconnect Gateway stats
+        ca.finalize_libca()
+        ca.initialize_libca()
+        gw_vctotal = ca.create_channel("gwtest:vctotal")
+        gw_pvtotal = ca.create_channel("gwtest:pvtotal")
+        gw_connected = ca.create_channel("gwtest:connected")
+        gw_active = ca.create_channel("gwtest:active")
+        gw_inactive = ca.create_channel("gwtest:inactive")
+
+        # gateway should show no VC and 1 connected inactive PV
+        count = ca.get(gw_vctotal)
+        self.assertTrue(count == 0, "Expected GW VC total count: 0, actual: " + str(count))
+        count = ca.get(gw_pvtotal)
+        self.assertTrue(count == 1, "Expected GW PV total count: 1, actual: " + str(count))
+        count = ca.get(gw_connected)
+        self.assertTrue(count == 1, "Expected GW connected PV count: 1, actual: " + str(count))
+        count = ca.get(gw_active)
+        self.assertTrue(count == 0, "Expected GW active PV count: 0, actual: " + str(count))
+        count = ca.get(gw_inactive)
+        self.assertTrue(count == 1, "Expected GW inactive PV count: 1, actual: " + str(count))
+
+        # set warning limit on IOC
+        ioc_high = ca.create_channel("ioc:gwcachetest.HIGH")
+        ca.put(ioc_high, 20.0, wait=True)
+        time.sleep(.1)
+
+        # reconnect Gateway and IOC
+        gw = ca.create_channel("gateway:gwcachetest")
+        connected = ca.connect_channel(gw, timeout=.5)
+        self.assertTrue(connected, "Could not connect to gateway channel " + ca.name(gw))
+        ioc = ca.create_channel("ioc:gwcachetest")
+        connected = ca.connect_channel(ioc, timeout=.5)
+        self.assertTrue(connected, "Could not connect to ioc channel " + ca.name(gw))
+
+        # gateway should show one VC and one connected active PV
+        count = ca.get(gw_vctotal)
+        self.assertTrue(count == 1, "Expected GW VC total count: 1, actual: " + str(count))
+        count = ca.get(gw_pvtotal)
+        self.assertTrue(count == 1, "Expected GW PV total count: 1, actual: " + str(count))
+        count = ca.get(gw_connected)
+        self.assertTrue(count == 1, "Expected GW connected PV count: 1, actual: " + str(count))
+        count = ca.get(gw_active)
+        self.assertTrue(count == 1, "Expected GW active PV count: 1, actual: " + str(count))
+        count = ca.get(gw_inactive)
+        self.assertTrue(count == 0, "Expected GW inactive PV count: 0, actual: " + str(count))
+
+        # now the limit should have been updated
+        ioc_ctrl = ca.get_ctrlvars(ioc)
+        highVal = ioc_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 20.0, "Expected IOC warning_limit: 20; actual limit: "+ str(highVal))
+        gw_ctrl = ca.get_ctrlvars(gw)
+        highVal = gw_ctrl['upper_warning_limit']
+        self.assertTrue(highVal == 20.0, "Expected GW warning_limit: 20; actual limit: "+ str(highVal))
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)

=== added file 'testTop/pyTestsApp/access.txt'
--- testTop/pyTestsApp/access.txt	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/access.txt	2015-07-02 13:38:28 +0000
@@ -0,0 +1,3 @@
+ASG(DEFAULT) {
+   RULE(1,WRITE)
+}

=== added file 'testTop/pyTestsApp/gwtests.py'
--- testTop/pyTestsApp/gwtests.py	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/gwtests.py	2015-07-02 13:38:28 +0000
@@ -0,0 +1,67 @@
+#!/usr/bin/env python
+'''CA Gateway test configuration'''
+
+import os
+import sys
+
+# Do we want verbose logging
+verbose = False
+# Do we want debug logging from the gateway
+verboseGateway = False
+
+# CA ports to use
+iocPort = 12782
+gwPort = 12783
+
+# Duration of standalong runs
+gwRunDuration = 300
+iocRunDuration = 300
+
+# Gateway attributes
+gwStatsPrefix = "gwtest"
+
+# Defaults for EPICS properties:
+gwLocation = "../.."
+hostArch = "linux-x86_64"
+
+iocExecutable = "softIoc"
+gwExecutable = ""
+gwDebug = 10
+
+def setup():
+    '''Sets up test parameters for CA Gateway tests
+    '''
+    global verbose, verboseGateway, gwLocation, hostArch
+    global iocExecutable, gwExecutable, gwDebug
+
+    if 'VERBOSE' in os.environ and os.environ['VERBOSE'].lower().startswith('y'):
+        verbose = True
+
+    if 'VERBOSE_GATEWAY' in os.environ:
+        verboseGateway = True
+        if os.environ['VERBOSE_GATEWAY'].isdigit():
+            gwDebug = os.environ['VERBOSE_GATEWAY']
+
+    if 'EPICS_HOST_ARCH' in os.environ:
+        hostArch = os.environ['EPICS_HOST_ARCH']
+    elif 'T_A' in os.environ:
+        hostArch = os.environ['T_A']
+    else:
+        print "Warning: EPICS_HOST_ARCH not set. Using default value of '{0}'".format(hostArch)
+
+    if 'TOP' in os.environ:
+        gwLocation = os.path.join(os.environ['TOP'], '..')
+    else:
+        print "Warning: TOP not set. Using default value of '..'"
+
+    gwExecutable = os.path.join(gwLocation, 'bin', hostArch, 'gateway')
+    if not os.path.exists(gwExecutable):
+        print "Cannot find the gateway executable at", gwExecutable
+        sys.exit(1)
+
+    if 'IOC_EPICS_BASE' in os.environ:
+        iocExecutable = os.path.join(os.environ['IOC_EPICS_BASE'], 'bin', hostArch, 'softIoc')
+    elif 'EPICS_BASE' in os.environ:
+        iocExecutable = os.path.join(os.environ['EPICS_BASE'], 'bin', hostArch, 'softIoc')
+    else:
+        print "Warning: IOC_EPICS_BASE or EPICS_BASE not set. Running 'softIoc' executable in PATH"

=== added file 'testTop/pyTestsApp/pvlist.txt'
--- testTop/pyTestsApp/pvlist.txt	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/pvlist.txt	2015-07-02 13:38:28 +0000
@@ -0,0 +1,8 @@
+# gwlist file for Gateway tests
+#
+# Convert gateway: prefix to ioc: prefix on IOC side
+# Do NOT serve the IOC channels under their original name
+#
+gateway:\(.*\)  ALIAS ioc:\1
+ioc:.*          DENY
+gwtest:.*       ALLOW

=== added file 'testTop/pyTestsApp/test.db'
--- testTop/pyTestsApp/test.db	1970-01-01 00:00:00 +0000
+++ testTop/pyTestsApp/test.db	2015-07-02 13:38:28 +0000
@@ -0,0 +1,76 @@
+record(calcout, "ioc:auto:cnt") {
+  field(SCAN, "1 second")
+  field(CALC, "A+B")
+  field(INPA, "ioc:auto:cnt.VAL NPP")
+  field(INPB, "0.01")
+  field(OCAL, "sin(A)")
+  field(DOPT, "Use OCAL")
+  field(OUT , "ioc:auto PP")
+}
+
+record(ai, "ioc:auto") {
+  field(PREC , 10)
+  field(DESC , "A PV that changes once a second")
+}
+
+record(ai, "ioc:passive0") {
+  field(DESC , "No MDEL/ADEL + passive")
+  field(SCAN, "Passive")
+}
+
+record(ai, "ioc:passiveADEL") {
+  field(DESC , "ADEL + passive")
+  field(ADEL , "10.0")
+  field(SCAN, "Passive")
+}
+
+record(ai, "ioc:passiveALRM") {
+  field(DESC , "Alarm + passive")
+  field(SCAN, "Passive")
+  field(HIGH, "5.0")
+  field(HIHI, "10.0")
+  field(HSV, MINOR)
+  field(HHSV, MAJOR)
+}
+
+record(ai, "ioc:passiveADELALRM") {
+  field(DESC , "ADEL, Alarm + passive")
+  field(SCAN, "Passive")
+  field(ADEL , "0.5")
+  field(HIGH, "5.0")
+  field(HIHI, "10.0")
+  field(HSV, MINOR)
+  field(HHSV, MAJOR)
+}
+
+record(mbbi, "ioc:passiveMBBI") {
+  field(DESC , "Passive mbbi")
+  field(SCAN, "Passive")
+}
+
+record(longin, "ioc:passivelongin") {
+  field(DESC , "Passive longin")
+  field(SCAN, "Passive")
+}
+
+record(waveform, "ioc:passivewaveform") {
+  field(DESC , "Passive waveform")
+  field(SCAN, "Passive")
+  field(NELM, "1000")
+  field(FTVL, "DOUBLE")
+}
+
+record(ai, "ioc:gwcachetest") {
+  field(PREC, "3")
+  field(EGU, "wobbles")
+  field(HIGH, "10")
+  field(HIHI, "100")
+  field(HSV , "MINOR")
+  field(HHSV , "MAJOR")
+  field(LOW , "-10")
+  field(LOLO , "-100")
+  field(LSV , "MINOR")
+  field(LLSV , "MAJOR")
+}
+
+