[csw-devel] SF.net SVN: gar:[12088] csw/mgar/gar/v2/lib/python/package_checks_test.py

[wahwah at users.sourceforge.net]

Revision: 12088
          http://gar.svn.sourceforge.net/gar/?rev=12088&view=rev
Author:   wahwah
Date:     2010-12-27 12:22:47 +0000 (Mon, 27 Dec 2010)

Log Message:
-----------
checkpkg: Removing the MoxMetaTestBase magic

And using a more effective way to disable a package.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/package_checks_test.py

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-12-27 12:22:17 UTC (rev 12087)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-12-27 12:22:47 UTC (rev 12088)
@@ -33,8 +33,6 @@
 class CheckpkgUnitTestHelper(object):
   """Wraps common components of checkpkg tests."""
 
-  __metaclass__ = mox.MoxMetaTestBase
-
   def setUp(self):
     super(CheckpkgUnitTestHelper, self).setUp()
     self.mox = mox.Mox()
@@ -62,6 +60,7 @@
                                     self.error_mgr_mock,
                                     self.logger_mock,
                                     self.messenger)
+    self.mox.VerifyAll()
 
 
 class TestMultipleDepends(CheckpkgUnitTestHelper, unittest.TestCase):
@@ -1091,13 +1090,14 @@
     self.error_mgr_mock.NeedFile("CSWivtools", "/opt/csw/lib/libComUnidraw.so", mox.IsA(str))
 
 
-class TestSetCheckDirectoryDependenciesTree(CheckpkgUnitTestHelper,
-                                        unittest.TestCase):
+class TestSetCheckDirectoryDependenciesTree(
+                                            # This test is disabled for the
+                                            # time being.
+                                            # CheckpkgUnitTestHelper,
+                                            unittest.TestCase):
   """Test whether appropriate files are provided."""
   FUNCTION_NAME = 'SetCheckLibraries'
-  def testDefault(self):
-    # This test is disabled
-    pass
+
   def CheckpkgTest(self):
     self.pkg_data = tree_stats
     self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.