[tor-commits] [stem/master] Check the 'cached-microdescs' file for skipping, instead of 'cached-descriptors'

[atagar at torproject.org]

commit 04728e1408f5db4dccac5342c62d324db943cc82
Author: Dave Rolek <dmr-x at riseup.net>
Date:   Thu Jun 21 19:07:16 2018 +0000

    Check the 'cached-microdescs' file for skipping, instead of 'cached-descriptors'
    
    This should fix #26225, although attempts to reproduce were unfruitful,
    so the fix hasn't been directly tested.
    
    cefe584cd57c45a77379428a4c15fb225c0afdcc (which introduced the check for
    'cached-descriptors') had made this more stable, but since it was
    checking a different file, it seems that some temporal edge cases could
    still run this test into a failure, as evidenced by a few recent Jenkins
    failures.
---
 test/integ/control/controller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index cde8e140..4d28afac 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -1154,7 +1154,7 @@ class TestController(unittest.TestCase):
 
     runner = test.runner.get_runner()
 
-    if not os.path.exists(runner.get_test_dir('cached-descriptors')):
+    if not os.path.exists(runner.get_test_dir('cached-microdescs')):
       self.skipTest('(no cached microdescriptors)')
       return