TWEAKS: preserve fill.numpy etc. after unpickling and uniform naming convention for tests

Author: jpivarski

histogrammar/defs.py

@@ -176,6 +176,10 @@ def __getstate__(self):
         del state["fill"]
         return state
 
+    def __setstate__(self, dict):
+        self.__dict__ = dict
+        self.fill = FillMethod(self, self.fill)
+
     def copy(self):
         """Copy this container, making a clone with no reference to the original. """
         return self + self.zero()

setup.py

@@ -27,9 +27,9 @@ def finalize_options(self): pass
     def run(self):
         import sys, subprocess
         if sys.version_info[0] == 2 and sys.version_info[1] == 6:
-            args = ["-c", "import unittest; from test.basic import *; from test.testnumpy import *; from test.testrootcling import *; from test.testgpu import *; unittest.main()"]
+            args = ["-c", "import unittest; from test.testbasic import *; from test.testnumpy import *; from test.testrootcling import *; from test.testgpu import *; unittest.main()"]
         else:
-            args = ["-m", "unittest", "-v", "test.basic", "test.testnumpy", "test.testrootcling", "test.testgpu"]
+            args = ["-m", "unittest", "-v", "test.testbasic", "test.testnumpy", "test.testrootcling", "test.testgpu"]
         raise SystemExit(subprocess.call([sys.executable] + args))
 
 setup(name="Histogrammar",