Add integration tests, using real CLI

.github/workflows/test.yml

@@ -39,7 +39,11 @@ jobs:
           pip install .
 
       - name: Run tests
-        run: python test_eradicate.py
+        run: |
+          python test_eradicate.py
+          # Integration:
+          python -m eradicate setup.py
+          eradicate setup.py
 
 
   coverage:
@@ -61,6 +65,7 @@ jobs:
           coverage run --include='eradicate.py,test_eradicate.py' test_eradicate.py
           coverage report --show-missing
 
+
   windows:
     name: Tests with python ${{ matrix.python-version }} on Windows
     runs-on: windows-latest
@@ -81,7 +86,12 @@ jobs:
         run: python setup.py install
 
       - name: Run tests
-        run: python test_eradicate.py
+        run: |
+          python test_eradicate.py
+          # Integration:
+          python -m eradicate setup.py
+          eradicate setup.py
+
 
   python2:
     name: Tests with python ${{ matrix.python-version }}
@@ -105,4 +115,8 @@ jobs:
           python setup.py install
 
       - name: Run tests
-        run: python test_eradicate.py
+        run: |
+          python test_eradicate.py
+          # Integration:
+          python -m eradicate setup.py
+          eradicate setup.py

eradicate.py

@@ -27,9 +27,16 @@
 import difflib
 import io
 import os
+import sys
 import re
 import tokenize
 
+try:
+    detect_encoding = tokenize.detect_encoding
+except AttributeError:
+    from lib2to3.pgen2 import tokenize as lib2to3_tokenize
+    detect_encoding = lib2to3_tokenize.detect_encoding
+
 __version__ = '2.2.0'
 
 
@@ -213,8 +220,7 @@ def detect_encoding(self, filename):
         """Return file encoding."""
         try:
             with open(filename, 'rb') as input_file:
-                from lib2to3.pgen2 import tokenize as lib2to3_tokenize
-                encoding = lib2to3_tokenize.detect_encoding(input_file.readline)[0]
+                encoding = detect_encoding(input_file.readline)[0]
 
                 # Check for correctness of encoding.
                 with self.open_with_encoding(filename, encoding) as input_file:
@@ -236,7 +242,7 @@ def update_whitelist(self, new_whitelist, extend_default=True):
                 flags=re.IGNORECASE)
 
 
-def main(argv, standard_out, standard_error):
+def main(argv=sys.argv, standard_out=sys.stdout, standard_error=sys.stderr):
     """Main entry point."""
     import argparse
     parser = argparse.ArgumentParser(description=__doc__, prog='eradicate')
@@ -292,5 +298,10 @@ def main(argv, standard_out, standard_error):
             except IOError as exception:
                 print('{}'.format(exception), file=standard_error)
                 change_or_error = True
+
     if change_or_error and args.error:
         return 1
+
+
+if __name__ == '__main__':
+    main()

test_eradicate.py

@@ -552,14 +552,18 @@ def test_end_to_end(self):
 # x * 3 == False
 # x is a variable
 """) as filename:
-            process = subprocess.Popen([sys.executable,
-                                        './eradicate', filename],
-                                       stdout=subprocess.PIPE, universal_newlines=True)
+            process = subprocess.Popen([sys.executable, '-m'
+                                        'eradicate', filename],
+                                       stdout=subprocess.PIPE,
+                                       stderr=subprocess.PIPE,
+                                       universal_newlines=True)
+            out, err = process.communicate()
             self.assertEqual("""\
 @@ -1,2 +1 @@
 -# x * 3 == False
  # x is a variable""",
-            '\n'.join(process.communicate()[0].splitlines()[2:]))
+            '\n'.join(out.splitlines()[2:]))
+            self.assertEqual(err, '')
 
     def test_whitelist(self):
         mock_update = mock.Mock()