removing spurious dumps and fixing text of addressFilter test

4 files changed, 7 insertions, 10 deletions

diff --git a/cpp/RPMTools.py b/cpp/RPMTools.py
index f3f0047ea46..e72b1307405 100644
--- a/cpp/RPMTools.py
+++ b/cpp/RPMTools.py
@@ -92,7 +92,7 @@ class Package:
 
 %ifarch noarch
 ''')
-	for f in ['mono-core >= 1.1.9', 'mono-devel >= 1.1.9']:
+	for f in ['mono-core >= 1.1.13', 'mono-devel >= 1.1.13']:
             ofile.write('BuildRequires: ' + f  + '\n')
 
 	ofile.write('\n%endif\n')
diff --git a/cpp/src/Glacier2/ProxyVerifier.cpp b/cpp/src/Glacier2/ProxyVerifier.cpp
index e5aecff732b..e229a93beb9 100644
--- a/cpp/src/Glacier2/ProxyVerifier.cpp
+++ b/cpp/src/Glacier2/ProxyVerifier.cpp
@@ -572,7 +572,6 @@ public:
 		{
 		    if(!(*i)->match(host, pos))
 		    {
-			dump();
 			return false;
 		    }
 		}
diff --git a/cpp/test/Glacier2/addressFilter/Client.cpp b/cpp/test/Glacier2/addressFilter/Client.cpp
index 1061478cb94..277947d877a 100755
--- a/cpp/test/Glacier2/addressFilter/Client.cpp
+++ b/cpp/test/Glacier2/addressFilter/Client.cpp
@@ -84,8 +84,6 @@ AttackClient::run(int argc, char* argv[])
 	}
 	catch(const LocalException& e)
 	{
-	    cerr << "The exception is: " << e << endl;
-	    cerr << "-----------------------" << endl;
 	    test("Unexpected local exception" == 0);
 	}
     }
diff --git a/cpp/test/Glacier2/addressFilter/run.py b/cpp/test/Glacier2/addressFilter/run.py
index 163956e110c..a314df84aed 100755
--- a/cpp/test/Glacier2/addressFilter/run.py
+++ b/cpp/test/Glacier2/addressFilter/run.py
@@ -82,7 +82,7 @@ testcases = []
 
 if TestUtil.protocol == "ssl":
     testcases = [ 
-	('Testing maximum endpoints rule',
+	('testing maximum endpoints rule',
 	 (r'', r'', r'1'),
 	 [(True, 'hello:tcp -h %s -p 12010' % hostname),
 	  (False, 'hello:tcp -h %s -p 12010:ssl -h %s -p 12011' % (hostname, hostname))], [])
@@ -90,13 +90,13 @@ if TestUtil.protocol == "ssl":
 
 if not limitedTests:
     testcases.extend([
-	    ('Testing reject all',
+	    ('testing reject all',
              (r'', r'*', r''),
              [(False, 'helloA:tcp -h %s -p 12010' % fqdn),
               (False, 'helloB:tcp -h %s -p 12010' % hostname),
 	      (False, 'helloC:tcp -h 127.0.0.1 -p 12010'),
 	      (True, 'bar @ foo')], []),
-	    ('Testing loopback only rule',
+	    ('testing loopback only rule',
              (r'127.0.0.1 localhost', r'', r''),
              [(False, 'hello:tcp -h %s -p 12010' % fqdn),
               (False, 'hello:tcp -h %s -p 12010' % hostname),
@@ -107,16 +107,16 @@ if not limitedTests:
               (True, 'localhost/127.0.0.1:tcp -h localhost -p 12010'),
               (True, r'hello:tcp -h 127.0.0.1 -p 12010'),
               (True, r'hello/somecat:tcp -h localhost -p 12010')], []),
-	    ('Testing domain filter rule (accept)',
+	    ('testing domain filter rule (accept)',
              ("*" + domainname, r'', r''),
              [(True, 'hello:tcp -h %s -p 12010' % fqdn),
               (False, 'hello:tcp -h %s -p 12010' % hostname)], []),
-	    ('Testing domain filter rule (reject)',
+	    ('testing domain filter rule (reject)',
              (r'', "*" + domainname, r''),
              [(False, 'hello:tcp -h %s -p 12010' % fqdn),
               (True, 'hello:tcp -h %s -p 12010' % hostname),
               (True, 'bar:tcp -h 127.0.0.1 -p 12010')], []),
-            ('Testing domain filter rule (mixed)',
+            ('testing domain filter rule (mixed)',
              ("127.0.0.1", fqdn, r''),
 	     [(False, 'hello:tcp -h %s -p 12010:tcp -h 127.0.0.1 -p 12010' % fqdn),
               (True, 'bar:tcp -h 127.0.0.1 -p 12010')], []),