[Yt-svn] commit/yt: 2 new changesets

[Bitbucket]

2 new changesets in yt:

http://bitbucket.org/yt_analysis/yt/changeset/f142419ce5e0/
changeset:   f142419ce5e0
branch:      yt
user:        MatthewTurk
date:        2011-09-03 14:46:55
summary:     Updating tests; requires re-running gold standard.
affected #:  2 files (332 bytes)

--- a/tests/object_field_values.py	Sat Sep 03 00:12:39 2011 -0400
+++ b/tests/object_field_values.py	Sat Sep 03 08:46:55 2011 -0400
@@ -9,6 +9,33 @@
 class FieldHashesDontMatch(RegressionTestException):
     pass
 
+known_objects = {}
+
+def register_object(func):
+    known_objects[func.func_name] = func
+    return func
+
+ at register_object
+def centered_sphere(self):
+    center = 0.5*(self.pf.domain_right_edge + self.pf.domain_left_edge)
+    width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
+    self.data_object = self.pf.h.sphere(center, width/0.25)
+
+ at register_object
+def off_centered_sphere(self):
+    center = 0.5*(self.pf.domain_right_edge + self.pf.domain_left_edge)
+    width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
+    self.data_object = self.pf.h.sphere(center - 0.25 * width, width/0.25)
+
+ at register_object
+def corner_sphere(self):
+    width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
+    self.data_object = self.pf.h.sphere(self.pf.domain_left_edge, width/0.25)
+
+ at register_object
+def all_data(self):
+    self.data_object = self.pf.h.all_data()
+
 class YTFieldValuesTest(YTStaticOutputTest):
     def run(self):
         vals = self.data_object[self.field].copy()
@@ -18,42 +45,12 @@
     def compare(self, old_result):
         if self.result != old_result: raise FieldHashesDontMatch
 
-class CenteredSphere(YTFieldValuesTest):
+    def setup(self):
+        YTStaticOutputTest.setup(self)
+        known_objects[self.object_name](self)
 
-    def setup(self):
-        YTFieldValuesTest.setup(self)
-        center = 0.5*(self.pf.domain_right_edge + self.pf.domain_left_edge)
-        width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
-        self.data_object = self.pf.h.sphere(center, width/0.25)
+for object_name in known_objects:
+    for field in field_list + particle_field_list:
+        create_test(YTFieldValuesTest, "%s_%s" % (object_name, field),
+                    field = field, object_name = object_name)
 
-for field in field_list + particle_field_list:
-    create_test(CenteredSphere, "centered_sphere_%s" % (field), field = field)
-
-class OffCenteredSphere(YTFieldValuesTest):
-
-    def setup(self):
-        YTFieldValuesTest.setup(self)
-        center = 0.5*(self.pf.domain_right_edge + self.pf.domain_left_edge)
-        width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
-        self.data_object = self.pf.h.sphere(center - 0.25 * width, width/0.25)
-
-for field in field_list + particle_field_list:
-    create_test(OffCenteredSphere, "off_centered_sphere_%s" % (field), field = field)
-
-class CornerSphere(YTFieldValuesTest):
-
-    def setup(self):
-        YTFieldValuesTest.setup(self)
-        width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
-        self.data_object = self.pf.h.sphere(self.pf.domain_left_edge, width/0.25)
-
-for field in field_list + particle_field_list:
-    create_test(CornerSphere, "corner_sphere_%s" % (field), field = field)
-
-class AllData(YTFieldValuesTest):
-    def setup(self):
-        YTFieldValuesTest.setup(self)
-        self.data_object = self.pf.h.all_data()
-
-for field in field_list + particle_field_list:
-    create_test(AllData, "all_data_%s" % (field), field = field)


--- a/yt/utilities/answer_testing/runner.py	Sat Sep 03 00:12:39 2011 -0400
+++ b/yt/utilities/answer_testing/runner.py	Sat Sep 03 08:46:55 2011 -0400
@@ -133,7 +133,7 @@
             print "NO OLD RESULTS"
         else:
             if success == True: print "SUCCEEDED"
-            else: print "FAILED"
+            else: print "FAILED", msg
         self.passed_tests[test.name] = success
         if self.watcher is not None:
             if success == True:


http://bitbucket.org/yt_analysis/yt/changeset/b106c9a0da9b/
changeset:   b106c9a0da9b
branch:      stable
user:        MatthewTurk
date:        2011-09-03 14:46:55
summary:     Updating tests; requires re-running gold standard.
affected #:  2 files (332 bytes)

--- a/tests/object_field_values.py	Fri Sep 02 10:19:43 2011 -0400
+++ b/tests/object_field_values.py	Sat Sep 03 08:46:55 2011 -0400
@@ -9,6 +9,33 @@
 class FieldHashesDontMatch(RegressionTestException):
     pass
 
+known_objects = {}
+
+def register_object(func):
+    known_objects[func.func_name] = func
+    return func
+
+ at register_object
+def centered_sphere(self):
+    center = 0.5*(self.pf.domain_right_edge + self.pf.domain_left_edge)
+    width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
+    self.data_object = self.pf.h.sphere(center, width/0.25)
+
+ at register_object
+def off_centered_sphere(self):
+    center = 0.5*(self.pf.domain_right_edge + self.pf.domain_left_edge)
+    width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
+    self.data_object = self.pf.h.sphere(center - 0.25 * width, width/0.25)
+
+ at register_object
+def corner_sphere(self):
+    width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
+    self.data_object = self.pf.h.sphere(self.pf.domain_left_edge, width/0.25)
+
+ at register_object
+def all_data(self):
+    self.data_object = self.pf.h.all_data()
+
 class YTFieldValuesTest(YTStaticOutputTest):
     def run(self):
         vals = self.data_object[self.field].copy()
@@ -18,42 +45,12 @@
     def compare(self, old_result):
         if self.result != old_result: raise FieldHashesDontMatch
 
-class CenteredSphere(YTFieldValuesTest):
+    def setup(self):
+        YTStaticOutputTest.setup(self)
+        known_objects[self.object_name](self)
 
-    def setup(self):
-        YTFieldValuesTest.setup(self)
-        center = 0.5*(self.pf.domain_right_edge + self.pf.domain_left_edge)
-        width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
-        self.data_object = self.pf.h.sphere(center, width/0.25)
+for object_name in known_objects:
+    for field in field_list + particle_field_list:
+        create_test(YTFieldValuesTest, "%s_%s" % (object_name, field),
+                    field = field, object_name = object_name)
 
-for field in field_list + particle_field_list:
-    create_test(CenteredSphere, "centered_sphere_%s" % (field), field = field)
-
-class OffCenteredSphere(YTFieldValuesTest):
-
-    def setup(self):
-        YTFieldValuesTest.setup(self)
-        center = 0.5*(self.pf.domain_right_edge + self.pf.domain_left_edge)
-        width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
-        self.data_object = self.pf.h.sphere(center - 0.25 * width, width/0.25)
-
-for field in field_list + particle_field_list:
-    create_test(OffCenteredSphere, "off_centered_sphere_%s" % (field), field = field)
-
-class CornerSphere(YTFieldValuesTest):
-
-    def setup(self):
-        YTFieldValuesTest.setup(self)
-        width = (self.pf.domain_right_edge - self.pf.domain_left_edge).max()
-        self.data_object = self.pf.h.sphere(self.pf.domain_left_edge, width/0.25)
-
-for field in field_list + particle_field_list:
-    create_test(CornerSphere, "corner_sphere_%s" % (field), field = field)
-
-class AllData(YTFieldValuesTest):
-    def setup(self):
-        YTFieldValuesTest.setup(self)
-        self.data_object = self.pf.h.all_data()
-
-for field in field_list + particle_field_list:
-    create_test(AllData, "all_data_%s" % (field), field = field)


--- a/yt/utilities/answer_testing/runner.py	Fri Sep 02 10:19:43 2011 -0400
+++ b/yt/utilities/answer_testing/runner.py	Sat Sep 03 08:46:55 2011 -0400
@@ -130,7 +130,7 @@
         self.results[test.name] = test.result
         success, msg = self._compare(test)
         if success == True: print "SUCCEEDED"
-        else: print "FAILED"
+        else: print "FAILED", msg
         self.passed_tests[test.name] = success
         if self.watcher is not None:
             if success == True:

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

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