Merge pull request #1 from funbringer/clean_python_tests

arssher · web-flow · commit daf62121f5aa · 2018-02-01T22:04:44.000-08:00
Improve tests based on testgres
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,6 @@ bin/setup.sh
 
 *.pyc
 __pycache__
+
+env/
+venv/
diff --git a/Makefile b/Makefile
@@ -56,5 +56,9 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
+PYTHON = python3
 python_tests:
-	$(MAKE) -C tests/python
+	$(MAKE) -C tests/python PYTHON=$(PYTHON)
+
+# Special rule for PostgresPro
+testgres_check: python_tests
diff --git a/tests/python/.flake8 b/tests/python/.flake8
@@ -0,0 +1,3 @@
+[flake8]
+ignore = E501
+exclude = __pycache__
diff --git a/tests/python/.gitignore b/tests/python/.gitignore
@@ -0,0 +1 @@
+logs/
diff --git a/tests/python/Makefile b/tests/python/Makefile
@@ -1,6 +1,5 @@
-# we need to cd into dir with tests.py, otherwise unittest won't find it
-# dir containing this makefile
-mkfile_dir := $(shell dirname $(shell readlink -f $(abspath $(lastword $(MAKEFILE_LIST)))))
+# User should be able to override PYTHON
+PYTHON = python3
 
 all:
-	cd $(mkfile_dir) && python3 tests.py
+	$(PYTHON) tests.py
diff --git a/tests/python/make_pretty.sh b/tests/python/make_pretty.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+DIR=$(dirname $0)
+
+yapf -i "$DIR"/*.py
+flake8 "$DIR"
diff --git a/tests/python/tests.py b/tests/python/tests.py

-Original file line number
+Diff line change
 *.pyc
 __pycache__
++
 +env/
 +venv/