[yt-svn] commit/yt: xarthisius: Merged in xarthisius/yt (pull request #1348)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/e88ef09175f9/
Changeset:   e88ef09175f9
Branch:      yt
User:        xarthisius
Date:        2015-01-04 05:08:23+00:00
Summary:     Merged in xarthisius/yt (pull request #1348)

Fix typo in PixelizedProjectionValuesTest initializer
Affected #:  2 files

diff -r bff388fc33061ed00da992bf274c96433c66a058 -r e88ef09175f96b2d336ba2597f68df966458fb0f yt/frontends/tipsy/tests/test_outputs.py
--- a/yt/frontends/tipsy/tests/test_outputs.py
+++ b/yt/frontends/tipsy/tests/test_outputs.py
@@ -52,7 +52,7 @@
     for dobj_name in dso:
         for field in _fields:
             for axis in [0, 1, 2]:
-                for weight_field in [None, "density"]:
+                for weight_field in [None]:
                     yield PixelizedProjectionValuesTest(
                         ds, axis, field, weight_field,
                         dobj_name)
@@ -83,7 +83,7 @@
     for dobj_name in dso:
         for field in _fields:
             for axis in [0, 1, 2]:
-                for weight_field in [None, "density"]:
+                for weight_field in [None]:
                     yield PixelizedProjectionValuesTest(
                         ds, axis, field, weight_field,
                         dobj_name)

diff -r bff388fc33061ed00da992bf274c96433c66a058 -r e88ef09175f96b2d336ba2597f68df966458fb0f yt/utilities/answer_testing/framework.py
--- a/yt/utilities/answer_testing/framework.py
+++ b/yt/utilities/answer_testing/framework.py
@@ -491,7 +491,7 @@
         super(PixelizedProjectionValuesTest, self).__init__(ds_fn)
         self.axis = axis
         self.field = field
-        self.weight_field = field
+        self.weight_field = weight_field
         self.obj_type = obj_type
 
     def run(self):
@@ -504,7 +504,8 @@
                               data_source = obj)
         frb = proj.to_frb((1.0, 'unitary'), 256)
         frb[self.field]
-        frb[self.weight_field]
+        if self.weight_field is not None:
+            frb[self.weight_field]
         d = frb.data
         for f in proj.field_data:
             # Sometimes f will be a tuple.

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.