mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	forgot to modify TestDBM2 and TestGDBM2.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									462d4e1224
								
							
						
					
					
						commit
						7eee7f1cde
					
				
					 2 changed files with 22 additions and 26 deletions
				
			
		| 
						 | 
				
			
			@ -497,43 +497,41 @@ if defined? DBM
 | 
			
		|||
  end
 | 
			
		||||
 | 
			
		||||
  class TestDBM2 < Test::Unit::TestCase
 | 
			
		||||
    TMPROOT = "#{Dir.tmpdir}/ruby-dbm.#{$$}"
 | 
			
		||||
 | 
			
		||||
    def setup
 | 
			
		||||
      Dir.mkdir TMPROOT, 0755
 | 
			
		||||
      @tmproot = Dir.mktmpdir('ruby-dbm')
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def teardown
 | 
			
		||||
      FileUtils.rm_rf TMPROOT if File.directory?(TMPROOT)
 | 
			
		||||
      FileUtils.remove_entry_secure @tmproot if File.directory?(@tmproot)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_reader_open_notexist
 | 
			
		||||
      assert_raise(Errno::ENOENT) {
 | 
			
		||||
        DBM.open("#{TMPROOT}/a", 0666, DBM::READER)
 | 
			
		||||
        DBM.open("#{@tmproot}/a", 0666, DBM::READER)
 | 
			
		||||
      }
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_writer_open_notexist
 | 
			
		||||
      assert_raise(Errno::ENOENT) {
 | 
			
		||||
        DBM.open("#{TMPROOT}/a", 0666, DBM::WRITER)
 | 
			
		||||
        DBM.open("#{@tmproot}/a", 0666, DBM::WRITER)
 | 
			
		||||
      }
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_wrcreat_open_notexist
 | 
			
		||||
      v = DBM.open("#{TMPROOT}/a", 0666, DBM::WRCREAT)
 | 
			
		||||
      v = DBM.open("#{@tmproot}/a", 0666, DBM::WRCREAT)
 | 
			
		||||
      assert_instance_of(DBM, v)
 | 
			
		||||
      v.close
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_newdb_open_notexist
 | 
			
		||||
      v = DBM.open("#{TMPROOT}/a", 0666, DBM::NEWDB)
 | 
			
		||||
      v = DBM.open("#{@tmproot}/a", 0666, DBM::NEWDB)
 | 
			
		||||
      assert_instance_of(DBM, v)
 | 
			
		||||
      v.close
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_reader_open
 | 
			
		||||
      DBM.open("#{TMPROOT}/a") {} # create a db.
 | 
			
		||||
      v = DBM.open("#{TMPROOT}/a", nil, DBM::READER) {|d|
 | 
			
		||||
      DBM.open("#{@tmproot}/a") {} # create a db.
 | 
			
		||||
      v = DBM.open("#{@tmproot}/a", nil, DBM::READER) {|d|
 | 
			
		||||
        # Errno::EPERM is raised on Solaris which use ndbm.
 | 
			
		||||
        # DBMError is raised on Debian which use gdbm. 
 | 
			
		||||
        assert_raises(Errno::EPERM, DBMError) { d["k"] = "v" }
 | 
			
		||||
| 
						 | 
				
			
			@ -543,10 +541,10 @@ if defined? DBM
 | 
			
		|||
    end
 | 
			
		||||
 | 
			
		||||
    def test_newdb_open
 | 
			
		||||
      DBM.open("#{TMPROOT}/a") {|dbm|
 | 
			
		||||
      DBM.open("#{@tmproot}/a") {|dbm|
 | 
			
		||||
        dbm["k"] = "v"
 | 
			
		||||
      }
 | 
			
		||||
      v = DBM.open("#{TMPROOT}/a", nil, DBM::NEWDB) {|d|
 | 
			
		||||
      v = DBM.open("#{@tmproot}/a", nil, DBM::NEWDB) {|d|
 | 
			
		||||
        assert_equal(0, d.length)
 | 
			
		||||
        assert_nil(d["k"])
 | 
			
		||||
        true
 | 
			
		||||
| 
						 | 
				
			
			@ -555,7 +553,7 @@ if defined? DBM
 | 
			
		|||
    end
 | 
			
		||||
 | 
			
		||||
    def test_freeze
 | 
			
		||||
      DBM.open("#{TMPROOT}/a") {|d|
 | 
			
		||||
      DBM.open("#{@tmproot}/a") {|d|
 | 
			
		||||
        d.freeze
 | 
			
		||||
        assert_raises(RuntimeError) { d["k"] = "v" }
 | 
			
		||||
      }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -652,43 +652,41 @@ if defined? GDBM
 | 
			
		|||
  end
 | 
			
		||||
 | 
			
		||||
  class TestGDBM2 < Test::Unit::TestCase
 | 
			
		||||
    TMPROOT = "#{Dir.tmpdir}/ruby-gdbm.#{$$}"
 | 
			
		||||
 | 
			
		||||
    def setup
 | 
			
		||||
      Dir.mkdir TMPROOT, 0755
 | 
			
		||||
      @tmproot = Dir.mktmpdir('ruby-gdbm')
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def teardown
 | 
			
		||||
      FileUtils.rm_rf TMPROOT if File.directory?(TMPROOT)
 | 
			
		||||
      FileUtils.remove_entry_secure @tmproot if File.directory?(@tmproot)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_reader_open_notexist
 | 
			
		||||
      assert_raise(Errno::ENOENT) {
 | 
			
		||||
        GDBM.open("#{TMPROOT}/a", 0666, GDBM::READER)
 | 
			
		||||
        GDBM.open("#{@tmproot}/a", 0666, GDBM::READER)
 | 
			
		||||
      }
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_writer_open_notexist
 | 
			
		||||
      assert_raise(Errno::ENOENT) {
 | 
			
		||||
        GDBM.open("#{TMPROOT}/a", 0666, GDBM::WRITER)
 | 
			
		||||
        GDBM.open("#{@tmproot}/a", 0666, GDBM::WRITER)
 | 
			
		||||
      }
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_wrcreat_open_notexist
 | 
			
		||||
      v = GDBM.open("#{TMPROOT}/a", 0666, GDBM::WRCREAT)
 | 
			
		||||
      v = GDBM.open("#{@tmproot}/a", 0666, GDBM::WRCREAT)
 | 
			
		||||
      assert_instance_of(GDBM, v)
 | 
			
		||||
      v.close
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_newdb_open_notexist
 | 
			
		||||
      v = GDBM.open("#{TMPROOT}/a", 0666, GDBM::NEWDB)
 | 
			
		||||
      v = GDBM.open("#{@tmproot}/a", 0666, GDBM::NEWDB)
 | 
			
		||||
      assert_instance_of(GDBM, v)
 | 
			
		||||
      v.close
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def test_reader_open
 | 
			
		||||
      GDBM.open("#{TMPROOT}/a.dbm") {} # create a db.
 | 
			
		||||
      v = GDBM.open("#{TMPROOT}/a.dbm", nil, GDBM::READER) {|d|
 | 
			
		||||
      GDBM.open("#{@tmproot}/a.dbm") {} # create a db.
 | 
			
		||||
      v = GDBM.open("#{@tmproot}/a.dbm", nil, GDBM::READER) {|d|
 | 
			
		||||
        assert_raises(GDBMError) { d["k"] = "v" }
 | 
			
		||||
        true
 | 
			
		||||
      }
 | 
			
		||||
| 
						 | 
				
			
			@ -696,10 +694,10 @@ if defined? GDBM
 | 
			
		|||
    end
 | 
			
		||||
 | 
			
		||||
    def test_newdb_open
 | 
			
		||||
      GDBM.open("#{TMPROOT}/a.dbm") {|dbm|
 | 
			
		||||
      GDBM.open("#{@tmproot}/a.dbm") {|dbm|
 | 
			
		||||
        dbm["k"] = "v"
 | 
			
		||||
      } 
 | 
			
		||||
      v = GDBM.open("#{TMPROOT}/a.dbm", nil, GDBM::NEWDB) {|d|
 | 
			
		||||
      v = GDBM.open("#{@tmproot}/a.dbm", nil, GDBM::NEWDB) {|d|
 | 
			
		||||
        assert_equal(0, d.length)
 | 
			
		||||
        assert_nil(d["k"])
 | 
			
		||||
        true
 | 
			
		||||
| 
						 | 
				
			
			@ -708,7 +706,7 @@ if defined? GDBM
 | 
			
		|||
    end
 | 
			
		||||
 | 
			
		||||
    def test_freeze
 | 
			
		||||
      GDBM.open("#{TMPROOT}/a.dbm") {|d|
 | 
			
		||||
      GDBM.open("#{@tmproot}/a.dbm") {|d|
 | 
			
		||||
        d.freeze
 | 
			
		||||
        assert_raises(RuntimeError) { d["k"] = "v" }
 | 
			
		||||
      }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue