Changes for pva p4p tests

malcolm/imalcolm.py

@@ -288,11 +288,13 @@ def main():
 
     require("tornado", "numpy", "ruamel.yaml", "cothread==2.14", "vdsgen==0.2",
             "pygelf==0.3.1", "scanpointgenerator", "plop", "h5py==2.7.1")
-    #sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "cothread"))
-    sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "annotypes"))
-    #sys.path.append(
-    #    "/home/tmc43/virtualenvs/pymalcolm/lib/python2.7/site-packages")
     sys.path.append(
-        "/dls_sw/work/R3.14.12.3/support/pvaPy/lib/python/2.7/linux-x86_64")
+        os.path.join(os.path.dirname(__file__), "..", "..", "annotypes"))
+    # sys.path.append(
+    #     os.path.join(os.path.dirname(__file__), "..", "..", "cothread"))
+    # sys.path.append(
+    #     "/dls_sw/work/R3.14.12.3/support/pvaPy/lib/python/2.7/linux-x86_64")
+    sys.path.append(
+        "/scratch/pvaPy/lib/python/2.7/linux-x86_64")
 
     main()

malcolm/modules/demo/DEMO-HELLO.yaml

@@ -1,17 +1,9 @@
 # Create some Blocks
 - demo.blocks.hello_block:
-    mri: HELLO
-
-- demo.blocks.hello_block:
-    mri: HELLO2
+    mri: TESTHELLO
 
 - demo.blocks.counter_block:
-    mri: COUNTER
-
-# Add a webserver
-- web.blocks.web_server_block:
-    mri: WEB
-    port: 8009
+    mri: TESTCOUNTER
 
 - pva.blocks.pva_server_block:
     mri: PVA