[tor-commits] [stem/master] Test retrieving HS client name

[atagar at torproject.org]

commit 831dd0515d881248150342c8f4a37e2c51ee0bc3
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Oct 22 15:01:26 2020 -0700

    Test retrieving HS client name
    
    The issue that prevented us from testing this was fixed...
    
      19:28 <+atagar> dgoulet: What is the status of
        https://gitlab.torproject.org/tpo/core/tor/-/issues/40089 ? The last
        comment discusses another review, but then the 'Needs Review' tag was
        removed.
      19:29 <+dgoulet> atagar: so that has been merged upstream it appears
        and waiting for backport down to 043
      19:31 <+atagar> Ahh, great - thanks. Per chance do you know what tor
        version has the fix? If so then I can check for it in our tests
        (https://gitweb.torproject.org/stem.git/tree/test/integ/control/controller.py#n1650).
      19:34 <+dgoulet> atagar: not sure exactly which one but I think 0.4.4.5 +
      19:36 <+atagar> Thanks, I'll conditional the assertion on that version.
        If it makes any test runs sad just let me know.
      19:36 <+dgoulet> ack thanks
---
 test/integ/control/controller.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index 553b1a4e..a2cc175d 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -1647,13 +1647,10 @@ class TestController(unittest.TestCase):
       self.assertEqual('x25519', credential.key_type)
       self.assertEqual([], credential.flags)
 
-      # TODO: We should assert our client_name's value...
-      #
-      #   self.assertEqual('StemInteg', credential.client_name)
-      #
-      # ... but that's broken within tor...
-      #
-      #   https://gitlab.torproject.org/tpo/core/tor/-/issues/40089
+      # client names were fixed by https://gitlab.torproject.org/tpo/core/tor/-/issues/40089
+
+      if test.tor_version() >= stem.version.Version('0.4.4.5'):
+        self.assertEqual('StemInteg', credential.client_name)
 
       # deregister authentication credentials