make freebase.schema more readable, moved some tests, finalizing the stuff that should actually be in the package

git-svn-id: http://freebase-python.googlecode.com/svn/trunk@178 5914aa95-5b3a-0410-a3b5-7b719e7fe9b2

1 files changed, 7 insertions, 1 deletions

diff --git a/test/runtests.py b/test/runtests.py
index c90afb7..db2303b 100644
--- a/test/runtests.py
+++ b/test/runtests.py
@@ -16,18 +16,23 @@ def main():
         created = True
         USERNAME, PASSWORD = getlogindetails.main(create_password_file=True)
     USERNAME, PASSWORD = getlogindetails.main()        
+ 
     
     # run tests
     import test_freebase
     import test_schema_manipulation
+    import test_hardcore_schema_manipulation
 
     s1 = unittest.TestLoader().loadTestsFromTestCase(test_freebase.TestFreebase)
     s2 = unittest.TestLoader().loadTestsFromTestCase(test_schema_manipulation.TestSchemaManipulation)
+    s3 = unittest.TestLoader().loadTestsFromTestCase(test_hardcore_schema_manipulation.TestHardcoreSchemaManipulation)
     
     # This is very strange. If you try to do [s1, s2], thereby running freebase tests first, 
     # two tests in the testschemamanipulation file fail! They fail because of caching issues; if
     # I check on freebase, the changes are actually there. I have racked my mind for explanations.
-    anotherrun = unittest.TestSuite([s1, s2])
+    
+    # this is such a hack, and I'm sorry. The tests run 100% correct individually.
+    anotherrun = unittest.TestSuite([s1, s3, s2])
     
     #run = unittest.TestSuite(suites)
     
@@ -35,6 +40,7 @@ def main():
     if created: os.remove(passwordfile)  
     
     return anotherrun
+    
 
 
 if __name__ == '__main__':