Fix journal output (bug 1782), use tetj.py from misc-test

Author: Stew Benedict

scripts/package/Makefile

@@ -15,6 +15,7 @@ RPM_BINARY_NAME=$(FULL_PACKAGE_NAME)-$(RELEASE).$(RPM_BUILD_ARCH).rpm
 RPM_SOURCE_NAME=$(FULL_PACKAGE_NAME)-$(RELEASE).src.rpm
 
 SOURCE1 = $(PACKAGE)-$(VERSION).tar.gz
+TETJ = tetj.py
 
 # Temporary build directory
 TMP_BUILD_DIR=/tmp/$(FULL_PACKAGE_NAME)
@@ -53,6 +54,7 @@ RPM_SRPM_DIR=$(RPM_TMP_BUILD_DIR)/SRPMS
 # Override this on the command line to use a different repo
 BZRTREES?=http://bzr.freestandards.org/lsb/devel
 BZR_MODULE=$(PACKAGE)
+TETJ_MODULE=misc-test
 
 # Default target
 ifndef BUILD_NO_DEB
@@ -62,9 +64,9 @@ all: rpm_package
 endif
 
 clean:
-	@rm -f *.rpm *.deb *.tar.gz perldeps.pl
+	@rm -f *.rpm *.deb *.tar.gz tetj.py
 
-tarball: $(SOURCE1)
+tarball: $(SOURCE1) $(TETJ)
 
 deb_package: rpm_package
 	@fakeroot alien -cdk $(RPM_BINARY_NAME)
@@ -77,7 +79,7 @@ ifndef BUILD_NO_DEB
 	@ls *.deb
 endif
 
-$(RPM_BINARY_NAME) $(RPM_SOURCE_NAME): $(PACKAGE).spec $(SOURCE1) $(SOURCE2) 
+$(RPM_BINARY_NAME) $(RPM_SOURCE_NAME): $(PACKAGE).spec $(SOURCE1) $(TETJ) 
 	@mkdir -p $(RPM_TMP_BUILD_DIR)/BUILD
 	@mkdir -p $(RPM_TMP_BUILD_DIR)/RPMS
 	@mkdir -p $(RPM_TMP_BUILD_DIR)/SRPMS
@@ -93,4 +95,7 @@ endif
 $(SOURCE1):
 	bzr export $(SOURCE1) $(BZRTREES)/$(BZR_MODULE)
 
+$(TETJ):
+	bzr cat $(BZRTREES)/$(TETJ_MODULE)/tetj/tetj.py > tetj.py
+
 .PHONY : tarball rpm_package

scripts/package/lsbappchk-python.spec

@@ -7,6 +7,7 @@ Release: %{rel}
 License: GPL
 Group: Development/Tools
 Source: %{name}-%{version}.tar.gz
+Source1: tetj.py
 URL: http://www.linuxbase.org/test
 #Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-root
@@ -35,7 +36,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{basedir}/bin
 mkdir -p ${RPM_BUILD_ROOT}%{basedir}/lib/appchk
 mkdir -p ${RPM_BUILD_ROOT}%{basedir}/share/appchk
 cp -p source/lsbappchk.py ${RPM_BUILD_ROOT}%{basedir}/bin
-cp -p source/tet.py ${RPM_BUILD_ROOT}%{basedir}/lib/appchk
+cp -p %{SOURCE1} ${RPM_BUILD_ROOT}%{basedir}/lib/appchk
 cp -p lists/lsb-python-modules.list ${RPM_BUILD_ROOT}%{basedir}/share/appchk
 
 # VERSION file for the journal
@@ -62,6 +63,10 @@ fi
 
 #==================================================
 %changelog
+* Tue Nov 27 2007 Stew Benedict <stewb@linux-foundation.org>
+- fix journal issues (bug 1782)
+- use tetj.py from misc-test
+
 * Tue Jul 10 2007 Stew Benedict <stewb@linux-foundation.org>
 - _foo -> foo, add os, re, string
 - bump to release 2

source/lsbappchk.py

@@ -6,16 +6,39 @@
 
 import sys
 import os
+import md5
 # modulefinder does all the heavy lifting
 import modulefinder
 sys.path.append('/opt/lsb/lib/appchk')
-import tet
+import tetj
 
 # re-define the report class for our needs
 class lsbmf(modulefinder.ModuleFinder):
     def report(self):
         return self.modules 
 
+def sumfile(fobj):
+    m = md5.new()
+    while True:
+        d = fobj.read(8096)
+        if not d:
+            break
+        m.update(d)
+    return m.hexdigest()
+
+def file_info(journal, tfile):
+    fsize = os.path.getsize(tfile)
+    wstr = "FILE_SIZE %d" % (fsize)
+    journal.purpose_start('File information')
+    journal.testcase_info(1,0,0,wstr)
+    f = file(tfile, 'rb')
+    md5sum = sumfile(f)
+    f.close()
+    wstr = "BINARY_MD5SUM %s" % (md5sum)
+    journal.testcase_info(0,0,0,wstr)
+    journal.result(tetj.TETJ_PASS)        
+    journal.purpose_end()
+
 # compare the found modules to the LSB list and report
 # if the import uses a /opt path, just warn
 def check_modules(journal, modules, lsb_modules, syspath_org):
@@ -25,11 +48,11 @@ def check_modules(journal, modules, lsb_modules, syspath_org):
     keys.sort()
     tcount = 0;
     for key in keys:
-        jresult = 'PASS'
+        jresult = tetj.TETJ_PASS
         tcount = tcount + 1
         if journal:
-            tet.istart(tcount)
-            tet.info(tcount, 'Check ' + key)
+            journal.purpose_start('Check ' + key)
+        
         if key not in lsb_modules:
             if key != '__main__' and key != '__builtin__':
                 # warn if we're getting modules from outside sys.path
@@ -43,16 +66,17 @@ def check_modules(journal, modules, lsb_modules, syspath_org):
                     mdir = syspath_org[0]
                 if mdir not in syspath_org:
                     tresult = key + twarn + mdir
-                    jresult = 'UNRESOLVED'
+                    jresult = tetj.TETJ_UNRESOLVED
                 else:
                     tresult = key + tfail
-                    jresult = 'FAIL'
+                    jresult = tetj.TETJ_FAIL
                 print tresult
                 if journal:                
-                    tet.info(tcount, tresult)
+                    journal.testcase_info(0,0,0,tresult)
+
         if journal:
-            tet.result(tcount, jresult)        
-            tet.iend(tcount)
+            journal.result(jresult)        
+            journal.purpose_end()
 
 def main(argv):
     if len(argv) == 1:
@@ -82,11 +106,9 @@ def main(argv):
     # prep the journal header
     if journal:
         myname = os.path.basename(argv[0])
-        journal_file = tet.open_journal('journal.' + myname + '.' + jsuffix)
-        tet.write_header(journal_file)
-        vfile = sharepath + '/VERSION.' + myname
-        tet.write_version(journal_file,vfile)
-        tet.file_info(journal_file, testapp)
+        journal = tetj.Journal('journal.' + myname + '.' + jsuffix, testapp)
+        journal.add_config("VSX_NAME=lsb-tetjtest.py 0.1 (%s)" % journal.machine)
+        journal.config_end()
 
     path = sys.path[:]
     debug = 0
@@ -116,9 +138,14 @@ def main(argv):
 
     print testapp + ":"
     if journal:
-        tet.tstart(testapp)
+        journal.testcase_start(testapp)
+        file_info(journal, testapp)
+
     modules = mf.report()
     check_modules(journal, modules, lsb_modules, syspath_org)
+    if journal:
+        journal.testcase_end(testapp)
+        journal.close()
 
 if __name__=='__main__':
     main(sys.argv)