higgs 0.1.2 → 0.1.3

data/lib/higgs/store.rb

@@ -1,15 +1,14 @@
 # = storage like pstore
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-02 01:05:07 +0900 (Tue, 02 Oct 2007) $
-# Revision:: $Revision: 600 $
+# Date:: $Date: 2007-10-24 00:46:00 +0900 (Wed, 24 Oct 2007) $
+# Revision:: $Revision: 653 $
 #
 # == license
 #   :include:LICENSE
 #
 
-require 'higgs/storage'
-require 'higgs/tman'
+require 'higgs/sman'
 
 module Higgs
   # = storage like pstore
@@ -217,34 +216,19 @@ module Higgs
   #   1000
   #   %
   #
-  class Store
+  class Store < StorageManager
     # for ident(1)
-    CVS_ID = '$Id: store.rb 600 2007-10-01 16:05:07Z toki $'
-
-    include Storage::Export
-    include TransactionManager::Export
+    CVS_ID = '$Id: store.rb 653 2007-10-23 15:46:00Z toki $'
 
     DECODE = proc{|r| Marshal.load(r) }
     ENCODE = proc{|w| Marshal.dump(w) }
 
-    # <tt>name</tt> is a storage name and see Higgs::Storage.new for
-    # detail. see Higgs::Storage::InitOptions and
-    # Higgs::TransactionManager::InitOptions for <tt>options</tt>.
+    # see Higgs::StorageManager.new for <tt>name</tt> and <tt>options</tt>.
     def initialize(name, options={})
+      options = options.dup
       options[:decode] = DECODE
       options[:encode] = ENCODE
-      @storage = Storage.new(name, options)
-      @tman = TransactionManager.new(@storage, options)
-    end
-
-    def self.open(*args)
-      store = new(*args)
-      begin
-        r = yield(store)
-      ensure
-        store.shutdown
-      end
-      r
+      super(name, options)
     end
   end
 end

data/lib/higgs/thread.rb

@@ -1,8 +1,8 @@
 # = multi-thread utilities
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-09-26 00:20:20 +0900 (Wed, 26 Sep 2007) $
-# Revision:: $Revision: 559 $
+# Date:: $Date: 2007-10-31 00:36:09 +0900 (Wed, 31 Oct 2007) $
+# Revision:: $Revision: 659 $
 #
 # == license
 #   :include:LICENSE
@@ -15,7 +15,7 @@ require 'thread'
 module Higgs
   class Latch
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def initialize
       @lock = Mutex.new
@@ -43,7 +43,7 @@ module Higgs
 
   class CountDownLatch
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def initialize(count)
       @count = count
@@ -73,7 +73,7 @@ module Higgs
 
   class Barrier
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def initialize(count)
       @count = count
@@ -102,11 +102,11 @@ module Higgs
 
   class SharedWork
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def initialize(&work)
       unless (work) then
-        raise 'required work block'
+        raise ArgumentError, 'required work block'
       end
       @work = work
       @lock = Mutex.new
@@ -158,7 +158,7 @@ module Higgs
 
   class ReadWriteLock
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     def initialize
       @lock = Mutex.new
@@ -295,7 +295,7 @@ module Higgs
 
   class Pool
     # for ident(1)
-    CVS_ID = '$Id: thread.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: thread.rb 659 2007-10-30 15:36:09Z toki $'
 
     class ShutdownException < Exceptions::ShutdownException
     end

data/lib/higgs/tman.rb

@@ -1,14 +1,13 @@
 # = transaction manager
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-09-26 00:20:20 +0900 (Wed, 26 Sep 2007) $
-# Revision:: $Revision: 559 $
+# Date:: $Date: 2007-11-06 00:55:14 +0900 (Tue, 06 Nov 2007) $
+# Revision:: $Revision: 674 $
 #
 # == license
 #   :include:LICENSE
 #
 
-require 'forwardable'
 require 'higgs/cache'
 require 'higgs/exceptions'
 require 'higgs/lock'
@@ -18,7 +17,7 @@ require 'singleton'
 module Higgs
   class TransactionManager
     # for ident(1)
-    CVS_ID = '$Id: tman.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: tman.rb 674 2007-11-05 15:55:14Z toki $'
 
     include Exceptions
 
@@ -47,6 +46,10 @@ module Higgs
       # these options are defined.
       # [<tt>:read_only</tt>] if <tt>true</tt> then transaction is always read-only.
       #                       default is <tt>false</tt>.
+      #                       <tt>:standby</tt> is standby mode. in standby mode, transaction is
+      #                       read-only and Higgs::TransactionManager#apply_journal_log is callable.
+      #                       if Higgs::TransactionManager#switch_to_write is called in standby mode
+      #                       then state of manager changes from standby mode to read-write mode.
       # [<tt>:decode</tt>] procedure to decode data on read. if <tt>:string_only</tt>
       #                    property at an entry is <tt>true</tt> then <tt>decode</tt>
       #                    is not used to read the entry. default is <tt>proc{|r| r }</tt>.
@@ -60,6 +63,9 @@ module Higgs
       # [<tt>:secondary_cache</tt>] secondary read-cache for encoded string data.
       #                             key of cache is always unique string.
       #                             default is no effect.
+      # [<tt>:jlog_apply_dir</tt>] journal logs under the directory of this parameter is
+      #                            applied to storage on call of
+      #                            Higgs::TransactionManager#apply_journal_log
       def init_options(options)
         if (options.key? :read_only) then
           @read_only = options[:read_only]
@@ -72,31 +78,23 @@ module Higgs
         @lock_manager = options[:lock_manager] || GiantLockManager.new
         @master_cache = options[:master_cache] || LRUCache.new
         @secondary_cache = options[:secondary_cache] || PseudoSecondaryCache.instance
+        @jlog_apply_dir = options[:jlog_apply_dir] || nil
       end
 
       attr_reader :read_only
     end
     include InitOptions
 
-    # export Higgs::TransactionManager methods from <tt>@tman</tt> instance variable.
-    #
-    # these methods are delegated.
-    # * Higgs::TransactionManager#read_only
-    # * Higgs::TransactionManager#transaction
-    #
-    module Export
-      extend Forwardable
-
-      def_delegator :@tman, :read_only
-      def_delegator :@tman, :transaction
-    end
-
+    # see Higgs::TransactionManager::InitOptions for <tt>options</tt>.
     def initialize(storage, options={})
       @storage = storage
       init_options(options)
+      if (@read_only == :standby && ! @jlog_apply_dir) then
+        raise ArgumentError, "need for `:jlog_apply_dir' parameter in standby mode"
+      end
       @master_cache = SharedWorkCache.new(@master_cache) {|key|
-        (id = @storage.identity(key) and @secondary_cache[id]) or
-          (value = @storage.fetch(key) and @secondary_cache[@storage.identity(key)] = value.freeze)
+        (id = @storage.unique_data_id(key) and @secondary_cache[id]) or
+          (value = @storage.fetch(key) and @secondary_cache[@storage.unique_data_id(key)] = value.freeze)
       }
     end
 
@@ -134,11 +132,38 @@ module Higgs
     def self.current_transaction
       Thread.current[:higgs_current_transaction]
     end
+
+    def apply_journal_log(not_delete=false)
+      @lock_manager.exclusive{
+        if (@read_only != :standby) then
+          raise "not standby mode: #{@read_only}"
+        end
+        name = File.join(@jlog_apply_dir, File.basename(@storage.name))
+        for jlog_path in Storage.rotated_entries("#{name}.jlog")
+          @storage.apply_journal_log(jlog_path) {|key|
+            @master_cache.delete(key)
+          }
+          File.unlink(jlog_path) unless not_delete
+        end
+      }
+      nil
+    end
+
+    def switch_to_write
+      @lock_manager.exclusive{
+        if (@read_only != :standby) then
+          raise "not standby mode: #{@read_only}"
+        end
+        @read_only = false
+        @storage.switch_to_write
+      }
+      nil
+    end
   end
 
   class TransactionContext
     # for ident(1)
-    CVS_ID = '$Id: tman.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: tman.rb 674 2007-11-05 15:55:14Z toki $'
 
     include Enumerable
 
@@ -330,6 +355,12 @@ module Higgs
       if (@ope_map[key] != :delete) then
         if (properties = @local_properties_cache[key]) then
           case (name)
+          when :identity
+            @storage.identity(key)
+          when :data_change_number
+            @storage.data_change_number(key)
+          when :properties_change_number
+            @storage.properties_change_number(key)
           when Symbol
             properties['system_properties'][name.to_s]
           when String
@@ -384,6 +415,12 @@ module Higgs
 
       if (self.key? key) then   # lock
         case (name)
+        when :identity
+          return @storage.identity(key) != nil
+        when :data_change_number
+          return @storage.data_change_number(key) != nil
+        when :properties_change_number
+          return @storage.properties_change_number(key) != nil
         when Symbol
           return (@local_properties_cache[key]['system_properties'].key? name.to_s)
         when String
@@ -399,6 +436,15 @@ module Higgs
       unless (self.key? key) then # lock
         raise IndexError, "not exist properties at key: #{key}"
       end
+      if (value = @storage.identity(key)) then
+        yield(:identity, value)
+      end
+      if (value = @storage.data_change_number(key)) then
+        yield(:data_change_number, value)
+      end
+      if (value = @storage.properties_change_number(key)) then
+        yield(:properties_change_number, value)
+      end
       @local_properties_cache[key]['system_properties'].each_pair do |name, value|
         yield(name.to_sym, value)
       end
@@ -467,7 +513,6 @@ module Higgs
           case (ope)
           when :write
             @master_cache.delete(key)
-            @secondary_cache[key] = value
           when :delete
             @master_cache.delete(key)
             @secondary_cache.delete(key)

data/lib/higgs/utils/bman.rb

@@ -1,8 +1,8 @@
 # = backup manager
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-10 00:49:33 +0900 (Wed, 10 Oct 2007) $
-# Revision:: $Revision: 626 $
+# Date:: $Date: 2007-11-11 11:20:51 +0900 (Sun, 11 Nov 2007) $
+# Revision:: $Revision: 682 $
 #
 # == license
 #   :include:LICENSE
@@ -11,6 +11,7 @@
 require 'drb'
 require 'fileutils'
 require 'higgs/flock'
+require 'higgs/jlog'
 require 'higgs/storage'
 
 module Higgs
@@ -18,11 +19,16 @@ module Higgs
     # = backup manager
     # == requirements for online-backup
     #
-    # these parameters should be required when Higgs::Storage is opened.
+    # these parameters should be required when Higgs::StorageManager
+    # of backup target is opened.
     #
     # [<tt>:jlog_rotate_max</tt>] value is <tt>0</tt>. rotated journal logs shuold be preserved.
-    # [<tt>:jlog_rotate_service_uri</tt>] value is <tt>"druby://localhost:<em>appropriate_port_number</em>"</tt>.
-    #                                     journal log rotation remote service should be enabled.
+    # [<tt>:remote_services_uri</tt>] value is <tt>"druby://<em>host</em>:<em>port</em>"</tt>.
+    #                                 journal log rotation remote service should be enabled.
+    #
+    # DRb service should be started before Higgs::BackupManager is used.
+    #
+    #   DRb.start_service
     #
     # == online-backup
     #
@@ -104,8 +110,7 @@ module Higgs
     #       -f, --from=BACKUP_TARGET_STORAGE
     #       -t, --to-dir=DIR_TO_BACKUP
     #       -n, --to-name=NAME_TO_BACKUP
-    #       -u=URI
-    #           --jlog-rotate-service-uri
+    #       -U, --remote-services-uri=URI
     #       -v, --verbose, --[no-]verbose
     #           --verbose-level=LEVEL
     #
@@ -145,27 +150,30 @@ module Higgs
     # if this option is omitted then <tt>NAME_TO_BACKUP</tt> is the same
     # as <tt>BACKUP_TARGET_STORAGE</tt>.
     #
-    # === OPTION: <tt>--jlog-rotate-service-uri=URI</tt>
+    # === OPTION: <tt>--remote-services-uri=URI</tt>
     # access point for journal log rotation remote service.
-    # <tt>URI</tt> is the same as <tt>:jlog_rotate_service_uri</tt>
-    # when Higgs::Storage is opened.
+    # <tt>URI</tt> is the same as <tt>:remote_services_uri</tt>
+    # when Higgs::StorageManager is opened.
     #
     # === OPTION: <tt>--verbose</tt>
     # verbose level up.
     #
+    # === OPTION: <tt>--no-verbose</tt>
+    # verbose level down.
+    #
     # === OPTION: <tt>--verbose-level=LEVEL</tt>
     # set verbose level to <tt>LEVEL</tt>.
     #
     class BackupManager
       # for ident(1)
-      CVS_ID = '$Id: bman.rb 626 2007-10-09 15:49:33Z toki $'
+      CVS_ID = '$Id: bman.rb 682 2007-11-11 02:20:51Z toki $'
 
       def initialize(options={})
         @from = options[:from]
         to_dir = options[:to_dir]
         to_name = options[:to_name] || (@from && File.basename(@from))
         @to = File.join(to_dir, to_name) if (to_dir && to_name)
-        @jlog_rotate_service_uri = options[:jlog_rotate_service_uri]
+        @remote_services_uri = options[:remote_services_uri]
         @verbose = options[:verbose] || 0
         @out = options[:out] || STDOUT
       end
@@ -179,11 +187,20 @@ module Higgs
       private :log
 
       def connect_service
-        unless (@jlog_rotate_service_uri) then
-          raise 'required jlog_rotate_service_uri'
+        unless (@remote_services_uri) then
+          raise 'required remote_services_uri'
         end
-        @out << log("connect to jlog_rotate_service: #{@jlog_rotate_service_uri}") if (@verbose >= 2)
-        @jlog_rotate_service = DRbObject.new_with_uri(@jlog_rotate_service_uri)
+        @out << log("connect to remote services: #{@remote_services_uri}") if (@verbose >= 2)
+        @services = DRbObject.new_with_uri(@remote_services_uri)
+
+        localhost_check_service = @services[:localhost_check_service_v1] or
+          raise 'not provided remote service: localhost_check_service_v1'
+        localhost_check_service.call{|localhost_check|
+          localhost_check.call
+        }
+
+        @jlog_rotate_service = @services[:jlog_rotate_service_v1] or
+          raise 'not provided remote service: jlog_rotate_service_v1'
       end
       private :connect_service
 
@@ -231,8 +248,11 @@ module Higgs
         unless (@to) then
           raise 'required to_storage'
         end
-        for path in Storage.rotate_entries("#{@from}.jlog")
+        for path in Storage.rotated_entries("#{@from}.jlog")
           path =~ /\.jlog\.\d+$/ or raise "mismatch jlog name: #{path}"
+          unless (JournalLogger.has_eof_mark? path) then
+            raise "broken journal log: #{path}"
+          end
           ext = $&
           FileUtils.cp(path, "#{@to}#{ext}", :preserve => true, :verbose => @verbose >= 2)
         end
@@ -275,7 +295,7 @@ module Higgs
           raise 'required to_storage'
         end
 
-        for to_jlog in Storage.rotate_entries("#{@to}.jlog")
+        for to_jlog in Storage.rotated_entries("#{@to}.jlog")
           to_jlog =~ /\.jlog\.\d+$/ or raise "mismatch jlog name: #{to_jlog}"
           ext = $&
           from_jlog = @from + ext
@@ -295,7 +315,7 @@ module Higgs
           raise 'required to_storage'
         end
 
-        for to_jlog in Storage.rotate_entries("#{@to}.jlog")
+        for to_jlog in Storage.rotated_entries("#{@to}.jlog")
           FileUtils.rm(to_jlog, :verbose => @verbose >= 2)
         end
 
@@ -330,7 +350,7 @@ module Higgs
           flock.synchronize{
             FileUtils.cp("#{@to}.idx", "#{@from}.idx", :preserve => true, :verbose => @verbose >= 2)
             FileUtils.cp("#{@to}.tar", "#{@from}.tar", :preserve => true, :verbose => @verbose >= 2)
-            for path in Storage.rotate_entries("#{@to}.jlog")
+            for path in Storage.rotated_entries("#{@to}.jlog")
               path =~ /\.jlog\.\d+$/ or raise "mismatch jlog name: #{path}"
               ext = $&
               FileUtils.cp(path, "#{@from}#{ext}", :preserve => true, :verbose => @verbose >= 2)

data/lib/higgs/version.rb

@@ -1,8 +1,8 @@
 # = version
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-10-12 16:19:52 +0900 (Fri, 12 Oct 2007) $
-# Revision:: $Revision: 628 $
+# Date:: $Date: 2007-11-11 11:22:01 +0900 (Sun, 11 Nov 2007) $
+# Revision:: $Revision: 683 $
 #
 # == license
 #   :include:LICENSE
@@ -10,9 +10,9 @@
 
 module Higgs
   # for ident(1)
-  CVS_ID = '$Id: version.rb 628 2007-10-12 07:19:52Z toki $'
+  CVS_ID = '$Id: version.rb 683 2007-11-11 02:22:01Z toki $'
 
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end
 
 # Local Variables:

data/lib/higgs.rb

@@ -1,8 +1,8 @@
 # = pure ruby transactional storage compatible with unix TAR format
 #
 # Author:: $Author: toki $
-# Date:: $Date: 2007-09-27 00:51:39 +0900 (Thu, 27 Sep 2007) $
-# Revision:: $Revision: 562 $
+# Date:: $Date: 2007-10-14 18:43:23 +0900 (Sun, 14 Oct 2007) $
+# Revision:: $Revision: 636 $
 #
 # == license
 #   :include:LICENSE
@@ -37,9 +37,9 @@ require 'higgs/version'
 #
 # === case of online backup
 #
-# [REQUIREMENTS] open with parameters:
+# [REQUIREMENTS] open Higgs::StorageManager with these parameters:
 #                <tt>jlog_rotate_max => 0</tt>,
-#                <tt>jlog_rotate_service_uri => "druby://localhost:<em>appropriate_port_number</em>"</tt>,
+#                <tt>remtoe_services_uri => "druby://<em>host</em>:<em>port</em>"</tt>,
 #                and execute <tt>higgs_backup</tt> (see Higgs::Utils::BackupManager)
 # [NORMAL SHUTDOWN] OK, no recovery
 # [PROCESS ABORT] OK, automatic recovery on read-write open

data/test/test_block.rb

@@ -1,6 +1,6 @@
 #!/usr/local/bin/ruby
 
-require 'digest/sha2'
+require 'digest'
 require 'fileutils'
 require 'higgs/block'
 require 'test/unit'
@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs::Block
 
     # for ident(1)
-    CVS_ID = '$Id: test_block.rb 591 2007-09-30 06:20:15Z toki $'
+    CVS_ID = '$Id: test_block.rb 654 2007-10-23 16:04:47Z toki $'
 
     def setup
       @io = File.open('block.test_io', 'w+')

data/test/test_cache.rb

@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_cache.rb 588 2007-09-30 05:39:54Z toki $'
+    CVS_ID = '$Id: test_cache.rb 659 2007-10-30 15:36:09Z toki $'
 
     CACHE_LIMIT_SIZE = 10
 
@@ -84,7 +84,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_cache.rb 588 2007-09-30 05:39:54Z toki $'
+    CVS_ID = '$Id: test_cache.rb 659 2007-10-30 15:36:09Z toki $'
 
     def setup
       @calc_calls = 0
@@ -212,10 +212,10 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_cache.rb 588 2007-09-30 05:39:54Z toki $'
+    CVS_ID = '$Id: test_cache.rb 659 2007-10-30 15:36:09Z toki $'
 
     def test_no_work_block
-      assert_raise(RuntimeError) {
+      assert_raise(ArgumentError) {
         SharedWorkCache.new
       }
     end

data/test/test_index.rb

@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
+    CVS_ID = '$Id: test_index.rb 650 2007-10-21 13:47:29Z toki $'
 
     def setup
       @idx = Index.new
@@ -45,7 +45,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
+    CVS_ID = '$Id: test_index.rb 650 2007-10-21 13:47:29Z toki $'
 
     def setup
       @idx = Index.new
@@ -91,7 +91,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
+    CVS_ID = '$Id: test_index.rb 650 2007-10-21 13:47:29Z toki $'
 
     def setup
       @idx = Index.new
@@ -164,7 +164,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
+    CVS_ID = '$Id: test_index.rb 650 2007-10-21 13:47:29Z toki $'
 
     def setup
       @idx = Index.new
@@ -205,7 +205,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_index.rb 589 2007-09-30 05:54:30Z toki $'
+    CVS_ID = '$Id: test_index.rb 650 2007-10-21 13:47:29Z toki $'
 
     def setup
       @path = 'test.idx'
@@ -246,12 +246,24 @@ module Higgs::Test
       }
 
       i = Index.new
+      i.storage_id = '68c6b76688d84b4d72856d8f589a5551'
       i.load(@path)
+
+      h = i.to_h
+      assert_equal([ Index::MAJOR_VERSION, Index::MINOR_VERSION ], h[:version])
+      assert_equal(0, h[:change_number])
+      assert_equal(1024, h[:eoa])
+      assert_equal({ 512 => [ 512 ] }, h[:free_lists])
+      assert_equal({ :foo => [ 'foo', 0 ] }, h[:index], 'index format version: 0.1')
+      assert_equal({ 'foo' => :foo }, h[:identities], 'index format version: 0.1')
+      assert_equal('68c6b76688d84b4d72856d8f589a5551', h[:storage_id], 'index format version: 0.2')
+
       assert_equal(0, i.change_number)
       assert_equal(1024, i.eoa)
       assert_equal(512, i.free_fetch(512))
       assert_equal(0, i[:foo])
       assert_equal('foo', i.identity(:foo))
+      assert_equal('68c6b76688d84b4d72856d8f589a5551', i.storage_id)
     end
 
     def test_migration_RuntimeError_unsupported_version

data/test/test_jlog.rb

@@ -10,7 +10,7 @@ module Higgs::Test
     include Higgs
 
     # for ident(1)
-    CVS_ID = '$Id: test_jlog.rb 559 2007-09-25 15:20:20Z toki $'
+    CVS_ID = '$Id: test_jlog.rb 657 2007-10-28 14:35:37Z toki $'
 
     def setup
       @path = 't.jlog'
@@ -110,7 +110,9 @@ module Higgs::Test
 
     def test_eof_mark_no_file
       assert_equal(false, (File.exist? @path))
-      assert_equal(true, (JournalLogger.has_eof_mark? @path))
+      assert_raise(Errno::ENOENT) {
+        JournalLogger.has_eof_mark? @path
+      }
     end
 
     def test_eof_mark_empty_file