[virtualcommons-svn] commit/vcweb: alllee: fixing pks in initial data fixtures.. this is painful, need to come up with a better

[Bitbucket <com...@bi...>]

1 new changeset in vcweb:

http://bitbucket.org/virtualcommons/vcweb/changeset/5b877f51e341/
changeset:   5b877f51e341
user:        alllee
date:        2011-08-05 22:46:29
summary:     fixing pks in initial data fixtures.. this is painful, need to come up with a better
scheme for this
affected #:  6 files (1.3 KB)

--- a/vcweb/core/models.py	Fri Aug 05 13:17:18 2011 -0700
+++ b/vcweb/core/models.py	Fri Aug 05 13:46:29 2011 -0700
@@ -165,6 +165,7 @@
             # check each experiment's total_elapsed_time against the total allotted time and
             # issue round_stopped signals to experiments that need to be stopped.
             for experiment in es.all():
+                logger.debug("checking elapsed time on experiment %s", experiment)
                 experiment.check_elapsed_time()
 
 class Experiment(models.Model):


--- a/vcweb/core/tests.py	Fri Aug 05 13:17:18 2011 -0700
+++ b/vcweb/core/tests.py	Fri Aug 05 13:46:29 2011 -0700
@@ -91,19 +91,6 @@
     class Meta:
         abstract = True
 
-class QueueTest(BaseVcwebTest):
-    def test_simple(self):
-        from kombu.connection import BrokerConnection
-        connection = BrokerConnection(transport="djkombu.transport.DatabaseTransport")
-        q = connection.SimpleQueue("chat")
-        for test_string in ('testing', '1-2-3', 'good gravy'):
-            q.put(test_string)
-            self.assertEqual(test_string, q.get().body)
-
-    def test_publish(self):
-        pass
-
-
 class ExperimentMetadataTest(BaseVcwebTest):
     namespace_regex = ExperimentMetadata.namespace_regex
 
@@ -306,7 +293,7 @@
         e = self.experiment
 # current_round is instructions, with no available parameters.
         round_configuration = e.current_round
-        name = 'initial.resource_level'
+        name = 'initial_resource_level'
         round_configuration.set_parameter(name=name, value=501)
         self.assertEqual(round_configuration.get_parameter_value(name), 501)
         self.assertEqual(round_configuration.get_parameter(name).value, round_configuration.get_parameter_value(name))


--- a/vcweb/forestry/fixtures/initial_data.json	Fri Aug 05 13:17:18 2011 -0700
+++ b/vcweb/forestry/fixtures/initial_data.json	Fri Aug 05 13:46:29 2011 -0700
@@ -189,7 +189,7 @@
     },
     {
         "fields": {
-        	"name":"reset.resource_level",
+        	"name":"reset_resource_level",
         	"experiment_metadata": 1,
         	"creator": 1,
         	"type": "boolean",
@@ -201,7 +201,7 @@
     },
     {
         "fields": {
-        	"name":"initial.resource_level",
+        	"name":"initial_resource_level",
         	"experiment_metadata": 1,
         	"creator": 1,
         	"type": "int",
@@ -249,7 +249,7 @@
     {
         "fields": {
         	"round_configuration": 2,
-                "parameter": [ "reset.resource_level" ],
+                "parameter": [ "reset_resource_level" ],
                 "boolean_value": "True"
         },
         "model": "core.roundparametervalue",
@@ -258,7 +258,7 @@
     {
         "fields": {
         	"round_configuration": 2,
-                "parameter": [ "initial.resource_level" ],
+                "parameter": [ "initial_resource_level" ],
                 "int_value": 100
         },
         "model": "core.roundparametervalue",
@@ -267,7 +267,7 @@
     {
         "fields": {
         	"round_configuration": 3,
-                "parameter": [ "reset.resource_level" ],
+                "parameter": [ "reset_resource_level" ],
                 "boolean_value": "True"
         },
         "model": "core.roundparametervalue",
@@ -276,7 +276,7 @@
     {
         "fields": {
         	"round_configuration": 3,
-                "parameter": [ "initial.resource_level" ],
+                "parameter": [ "initial_resource_level" ],
                 "int_value": 100
         },
         "model": "core.roundparametervalue",
@@ -285,7 +285,7 @@
     {
         "fields": {
         	"round_configuration": 5,
-                "parameter": [ "reset.resource_level" ],
+                "parameter": [ "reset_resource_level" ],
                 "boolean_value": "False"
         },
         "model": "core.roundparametervalue",


--- a/vcweb/forestry/models.py	Fri Aug 05 13:17:18 2011 -0700
+++ b/vcweb/forestry/models.py	Fri Aug 05 13:46:29 2011 -0700
@@ -45,10 +45,10 @@
     group.set_data_value(parameter=get_group_harvest_parameter(), value=value)
 
 def should_reset_resource_level(round_configuration):
-    return round_configuration.get_parameter_value('reset.resource_level', default=False)
+    return round_configuration.get_parameter_value('reset_resource_level', default=False)
 
 def get_initial_resource_level(round_configuration):
-    return round_configuration.get_parameter_value('initial.resource_level', default=100)
+    return round_configuration.get_parameter_value('initial_resource_level', default=100)
 
 def get_max_harvest_decision(resource_level):
     if resource_level >= 25:


--- a/vcweb/lighterprints/fixtures/initial_data.json	Fri Aug 05 13:17:18 2011 -0700
+++ b/vcweb/lighterprints/fixtures/initial_data.json	Fri Aug 05 13:46:29 2011 -0700
@@ -33,6 +33,19 @@
         "pk": 4
     },
     {
+        "fields": {
+            "date_created": "2011-07-07 15:13:03",
+            "duration": 0,
+            "experiment_configuration": 4,
+            "instructions": "Welcome to the sanitation experiment.",
+            "last_modified": "2011-07-07 15:13:03",
+            "round_type": "REGULAR",
+            "sequence_number": 1
+        },
+        "model": "core.roundconfiguration",
+        "pk": 44
+    },
+    {
         "pk": 4,
         "model": "lighterprints.activity",
         "fields": {


--- a/vcweb/sanitation/fixtures/initial_data.json	Fri Aug 05 13:17:18 2011 -0700
+++ b/vcweb/sanitation/fixtures/initial_data.json	Fri Aug 05 13:46:29 2011 -0700
@@ -44,6 +44,19 @@
     },
     {
         "fields": {
+            "date_created": "2011-07-07 15:13:03",
+            "duration": 0,
+            "experiment_configuration": 3,
+            "instructions": "Welcome to the sanitation experiment.",
+            "last_modified": "2011-07-07 15:13:03",
+            "round_type": "REGULAR",
+            "sequence_number": 1
+        },
+        "model": "core.roundconfiguration",
+        "pk": 43
+    },
+    {
+        "fields": {
             "authentication_code": "TEST_SANITATION",
             "current_round_elapsed_time": 0,
             "current_round_sequence_number": 1,
@@ -75,7 +88,7 @@
                 "description": "The integer values for this parameter represent locations in a text corpus (i.e., single coordinates OK)"
         },
         "model": "core.parameter",
-        "pk": 6
+        "pk": 7
     },
     {
         "fields": {
@@ -90,6 +103,6 @@
                 "description": "The integer values for this parameter are informal foreign keys to the sanitation.pollution location data value pks"
         },
         "model": "core.parameter",
-        "pk": 7
+        "pk": 8
     }
 ]

Repository URL: https://bitbucket.org/virtualcommons/vcweb/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.