[Happydoc-checkins] CVS: HappyDoc test_happydoc.py,1.87,1.88

[Doug H. <dou...@us...>]

Update of /cvsroot/happydoc/HappyDoc
In directory usw-pr-cvs1:/tmp/cvs-serv23968

Modified Files:
	test_happydoc.py 
Log Message:
Test definition cleanup, and fix the fix to the fix for using
webchecker.


Index: test_happydoc.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/test_happydoc.py,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** test_happydoc.py	4 Aug 2002 12:37:53 -0000	1.87
--- test_happydoc.py	24 Aug 2002 17:54:02 -0000	1.88
***************
*** 71,75 ****
  from happydoclib.StreamFlushTest import verboseLevel as globalVerboseLevel
  
! WEB_CHECKER_DIR='/home/dhellmann/Downloads/Python-2.2/Tools/webchecker/'
  
  if os.path.exists(WEB_CHECKER_DIR) and (os.name == 'posix'):
--- 71,75 ----
  from happydoclib.StreamFlushTest import verboseLevel as globalVerboseLevel
  
! WEB_CHECKER_DIR='../Python-2.2/Tools/webchecker/'
  
  if os.path.exists(WEB_CHECKER_DIR) and (os.name == 'posix'):
***************
*** 98,106 ****
  # Module
  #
- 
- if os.name == 'posix':
-     WEBCHECKER_AVAILABLE=1
- else:
-     WEBCHECKER_AVAILABLE=0
      
      
--- 98,101 ----
***************
*** 118,122 ****
          return
  
!     def runHappyDoc(self, modules=(), extraArgs=(), useWebChecker=WEBCHECKER_AVAILABLE):
          #
          # Fix up output directory variable
--- 113,117 ----
          return
  
!     def runHappyDoc(self, modules=(), extraArgs=(), useWebChecker=0):
          #
          # Fix up output directory variable
***************
*** 263,275 ****
          assert (not self.runHappyDoc( (os.path.join('TestCases', 'test.py'),),
                                        extraArgs=('-p', '-',),
!                                       useWebChecker=1
                                        )
                  ), 'Basic single-file docset test failed.'
          return
      
      def testSelfHTMLCompact(self):
          assert (not self.runHappyDoc( (os.path.join('TestCases', 'test.py'),),
                                        extraArgs=('formatter_compactHTML=yes',),
!                                       useWebChecker=1)
                  ), 'Full self documentation with compact output test failed.'
          return
--- 258,280 ----
          assert (not self.runHappyDoc( (os.path.join('TestCases', 'test.py'),),
                                        extraArgs=('-p', '-',),
!                                       useWebChecker=1,
                                        )
                  ), 'Basic single-file docset test failed.'
          return
      
+     def testHTMLSimpleWithPackageDescriptionFiles(self):
+         assert (not self.runHappyDoc( (os.path.join('TestCases',
+                                                     'test_package_summaries'),
+                                        ),
+                                       useWebChecker=1,
+                                       )
+                 ), 'Basic docset test with package description files failed.'
+         return
+     
      def testSelfHTMLCompact(self):
          assert (not self.runHappyDoc( (os.path.join('TestCases', 'test.py'),),
                                        extraArgs=('formatter_compactHTML=yes',),
!                                       useWebChecker=1,
!                                       )
                  ), 'Full self documentation with compact output test failed.'
          return
***************
*** 278,282 ****
          assert (not self.runHappyDoc( (os.path.join('TestCases', 'test.py'),),
                                        extraArgs=('-p', '-', '-T', 'SingleFile'),
!                                       useWebChecker=1
                                        )
                  ), 'Basic single-file docset test failed.'
--- 283,287 ----
          assert (not self.runHappyDoc( (os.path.join('TestCases', 'test.py'),),
                                        extraArgs=('-p', '-', '-T', 'SingleFile'),
!                                       useWebChecker=1,
                                        )
                  ), 'Basic single-file docset test failed.'
***************
*** 288,292 ****
                                                   'formatter_compactHTML=yes',
                                                   ),
!                                       useWebChecker=1
                                        )
                  ), 'Basic single-file docset test failed.'
--- 293,297 ----
                                                   'formatter_compactHTML=yes',
                                                   ),
!                                       useWebChecker=1,
                                        )
                  ), 'Basic single-file docset test failed.'
***************
*** 331,335 ****
          assert (not self.runHappyDoc( (os.path.join('TestCases',
                                                      'test_import_packages_basic'),),
!                                       useWebChecker=1
                                        )
                  ), 'Import from packages test failed.'
--- 336,340 ----
          assert (not self.runHappyDoc( (os.path.join('TestCases',
                                                      'test_import_packages_basic'),),
!                                       useWebChecker=1,
                                        )
                  ), 'Import from packages test failed.'
***************
*** 340,344 ****
                                                      'test_import_packages'),),
                                        extraArgs=('docset_usePackages=0',), 
!                                       useWebChecker=1
                                        )
                  ), 'Import from packages while ignoring package special handling test failed.'
--- 345,349 ----
                                                      'test_import_packages'),),
                                        extraArgs=('docset_usePackages=0',), 
!                                       useWebChecker=1,
                                        )
                  ), 'Import from packages while ignoring package special handling test failed.'
***************
*** 351,355 ****
                                                   '',
                                                   'formatter_filenamePrefix=TESTPREFIX_'),
!                                       useWebChecker=1
                                        )
                  ), 'Formatter output prefix test failed.'
--- 356,360 ----
                                                   '',
                                                   'formatter_filenamePrefix=TESTPREFIX_'),
!                                       useWebChecker=1,
                                        )
                  ), 'Formatter output prefix test failed.'
***************
*** 362,366 ****
      def testSelfHTML(self):
          assert (not self.runHappyDoc( (os.path.join(os.pardir, 'HappyDoc'),),
!                                       useWebChecker=1
                                        )
                  ), 'Full self documentation test failed.'
--- 367,371 ----
      def testSelfHTML(self):
          assert (not self.runHappyDoc( (os.path.join(os.pardir, 'HappyDoc'),),
!                                       useWebChecker=1,
                                        )
                  ), 'Full self documentation test failed.'
***************
*** 372,376 ****
                                                   'SGMLDocBook',
                                                   '-T',
!                                                  'SingleFile'))
                  ), 'Full self documentation in SGMLDocBook format output test failed.'
          return
--- 377,382 ----
                                                   'SGMLDocBook',
                                                   '-T',
!                                                  'SingleFile'),
!                                       )
                  ), 'Full self documentation in SGMLDocBook format output test failed.'
          return
***************
*** 381,385 ****
                                                   'docbookx',
                                                   '-T',
!                                                  'SingleFile'))
                  ), 'Full self documentation in DocBookS format output test failed.'
          return
--- 387,392 ----
                                                   'docbookx',
                                                   '-T',
!                                                  'SingleFile'),
!                                       )
                  ), 'Full self documentation in DocBookS format output test failed.'
          return