Merge branch from kschiess

2010-02-12 10:42:29 -06:00 · 2010-02-12 10:42:29 -06:00 · de4021f2e1
parent 9b614bee0e
commit de4021f2e1
2 changed files with 2 additions and 6 deletions
--- a/lib/net/snmp.rb
+++ b/lib/net/snmp.rb
@ -30,7 +30,7 @@ module Net

    class SNMP

-	AsnSyntax = BER.compile_syntax({
+	AsnSyntax = Net::BER.compile_syntax({
 	    :application => {
 		:primitive => {
 		    1 => :integer,	# Counter32, (RFC2578 sec 2)
--- a/test/common.rb
+++ b/test/common.rb
@ -1,7 +1,3 @@
 # Add 'lib' to load path.
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
-
-require 'rubygems'
 require 'test/unit'
-
-require 'net/ldap'
+require 'net'