4206 history_003_pos relies on exact size of history log and entries
4207 history_008_pos depends on obsolete internal history log message
4208 Typo in zfs_main.c: "posxiuser"
4209 Populate zfstest with the remainder of the STF tests
Reviewed by: Sonu Pillai <sonu.pillai@delphix.com>
Reviewed by: Will Guyette <will.guyette@delphix.com>
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>

*** 10,20 ****
  # source.  A copy of the CDDL is also available via the Internet at
  # http://www.illumos.org/license/CDDL.
  #
  
  #
! # Copyright (c) 2012 by Delphix. All rights reserved.
  #
  
  import ConfigParser
  import os
  import logging
--- 10,20 ----
  # source.  A copy of the CDDL is also available via the Internet at
  # http://www.illumos.org/license/CDDL.
  #
  
  #
! # Copyright (c) 2013 by Delphix. All rights reserved.
  #
  
  import ConfigParser
  import os
  import logging
*** 232,242 ****
          stdout/stderr/merged in it's own file.
          """
          if logger is None:
              return
  
!         user = ' (run as %s)' % self.user if len(self.user) else ''
          msga = 'Test: %s%s ' % (self.pathname, user)
          msgb = '[%s] [%s]' % (self.result.runtime, self.result.result)
          pad = ' ' * (80 - (len(msga) + len(msgb)))
  
          # If -q is specified, only print a line for tests that didn't pass.
--- 232,243 ----
          stdout/stderr/merged in it's own file.
          """
          if logger is None:
              return
  
!         logname = getpwuid(os.getuid()).pw_name
!         user = ' (run as %s)' % (self.user if len(self.user) else logname)
          msga = 'Test: %s%s ' % (self.pathname, user)
          msgb = '[%s] [%s]' % (self.result.runtime, self.result.result)
          pad = ' ' * (80 - (len(msga) + len(msgb)))
  
          # If -q is specified, only print a line for tests that didn't pass.