Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing trial errors and adding comments

  • Loading branch information...
commit b93d9563eee62eefd2c7c2cc379d289e463b81f0 1 parent 3f55be2
David Stuebe authored
View
16 README.txt
@@ -19,6 +19,7 @@ http://www.oceanobservatories.org/spaces/display/CIDev/LCAARCH+Development+Proje
LCAarch is compatible with Python 2.5 and higher, but not Python 3.x
This project has as dependencies Magnet, Carrot, txAMQP, Twisted and pycassa,
+and msgpack
(see below)
Get LCAarch with
@@ -98,6 +99,11 @@ carrot (use txamqp branch)
git clone git://amoeba.ucsd.edu/carrot.git
(cd carrot; git checkout -b txamqp origin/txamqp)
(cd carrot; python setup.py install)
+
+MsgPack
+----------------------------
+::
+ easy_install msgpack-python
Install the Magnet package [NEED Magent 0.3.4 on master branch]
------------------------------------------------------------------
@@ -120,6 +126,16 @@ again (see above). Please review the branch logs for any hints.
Change log:
===========
+2010-07-23:
+- Refactored the Registry Services to inherit from a common base class. This
+ will allow easier implementation of the many registries in the OOICI. The
+ Resource Registry and Service Registry now have basic registration of resource
+ descriptions and services.
+- The Ion message is now encoded usig the MsgPack library to allow for binary
+ transport of message content. The JSON library was mangleing string content.
+ This is a temporary fix for a wider problem with the encoding structure which
+ needs to be addressed in construction.
+
2010-06-07:
- Redefined logging import to set as module level logger. Each module has now
a different logger that can be configured separately. Don't configure
View
29 ion/play/test_methods.py
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-def print_me(self):
- print self.ME
-
-def print_you(self):
- print self.YOU
-
-class demo(object):
-
- ME = 'demo me'
- YOU = 'demo you'
- print_me = print_me
- print_you = print_you
-
-
-class prototype(object):
-
- ME = 'Proto me'
- YOU = 'Proto you'
- print_me = print_me
- print_you = print_you
-
-
-class test(prototype):
-
- test_me = test.print_me
- test_you = test.print_you
-
View
3  ion/services/coi/test/test_attributestore.py
@@ -125,6 +125,9 @@ def test_put_common_backend(self):
logging.info('tResult2 get: '+str(tres2))
self.assertEqual(tres2, 'tvalue1')
+ # Let cassandra register the new entry
+ pu.asleep(5)
+
# With common backends the value should be found.
resx1 = yield asc2.get('key1')
self.assertEqual(resx1, 'value2',msg='Failed to pull value from second service instance')
View
6 ion/services/coi/test/test_resource_registry.py
@@ -73,8 +73,8 @@ def test_resource_instance_reg(self):
resource_description = yield self.rrc.get_resource_definition(instance.description)
- print instance
- print resource_description
+ #print instance
+ #print resource_description
@@ -107,5 +107,5 @@ def test_reg_startup(self):
res_to_describe = coi_resource_descriptions.IdentityResource
res_description = yield self.rrc.register_resource_definition(res_to_describe)
- print res_description
+ #print res_description
View
4 ion/services/coi/test/test_service_registry.py
@@ -45,7 +45,7 @@ def test_service_reg(self):
svc_desc = yield self.src.get_service_definition(ref)
- print svc_desc
+ #print svc_desc
@defer.inlineCallbacks
def test_service_instance_reg(self):
@@ -59,7 +59,7 @@ def test_service_instance_reg(self):
sup = yield self._spawn_processes(services, sup=self.sup)
play_desc = yield self.src.register_service_instance(sup.child_procs[1])
- print play_desc
+ #print play_desc
View
2  ion/services/sa/test/test_instrument_registry.py
@@ -59,7 +59,7 @@ def test_resource_reg(self):
res3 = yield self.irc.get_instrument_type(ref)
self.assertEqual(res3.tau,-909.0)
- print res3
+ #print res3
Please sign in to comment.
Something went wrong with that request. Please try again.