[tor-commits] [stem/master] Test for incorrect password failed with RUN_MULTIPLE target

[atagar at torproject.org]

commit 5cd23cd9abc81c452e819afa8dbb79db438fb6b0
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Jun 22 08:48:13 2017 -0700

    Test for incorrect password failed with RUN_MULTIPLE target
    
    Oops, one of our test targets has both cookie *and* password auth. Our new test
    failed there because providing an incorrect password doesn't matter. Skipping
    the test with that target.
---
 test/integ/connection/authentication.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py
index a8c0c82..1ab6aae 100644
--- a/test/integ/connection/authentication.py
+++ b/test/integ/connection/authentication.py
@@ -278,8 +278,8 @@ class TestAuthenticate(unittest.TestCase):
 
     runner = test.runner.get_runner()
 
-    if test.runner.Torrc.PASSWORD not in runner.get_options():
-      self.skipTest('(requires password auth)')
+    if test.runner.Torrc.PASSWORD not in runner.get_options() or test.runner.Torrc.COOKIE in runner.get_options():
+      self.skipTest('(requires only password auth)')
       return
 
     for i in range(10):