commit e4bb1cc934b0e6011ca8dd14a3bdd51b5a9d30a6 Author: Damian Johnson atagar@torproject.org Date: Mon Mar 30 19:17:06 2020 -0700

Setuptools egg-info paths differ

Another test failure due to a minor difference between distutil and setuptools...

====================================================================== FAIL: test_install ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 141, in <lambda> self.method = lambda test: self.result(test) # method that can be mixed into TestCases File "/home/atagar/Desktop/stem/stem/util/test_tools.py", line 208, in result test.fail(self._result.msg) AssertionError: The following files weren't expected to be in our installation.

EGG-INFO/scripts/tor-prompt EGG-INFO/dependency_links.txt EGG-INFO/PKG-INFO EGG-INFO/not-zip-safe EGG-INFO/top_level.txt EGG-INFO/SOURCES.txt

Distutil has a single egg info file...

[install-prefix]/lib/python3.7/site-packages/stem-1.8.0_dev-py3.7.egg-info

Whereas setuptools creates several. --- test/integ/installation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integ/installation.py b/test/integ/installation.py index fc1e4880..55906288 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -44,7 +44,7 @@ def _assert_has_all_files(path):

for root, dirnames, filenames in os.walk(path): for filename in filenames: - if not filename.endswith('.pyc') and not filename.endswith('egg-info'): + if not filename.endswith('.pyc') and 'EGG-INFO' not in root: installed.add(os.path.join(root, filename)[len(path) + 1:])

missing = expected.difference(installed)