Fixing tests

armadaproject · Jun 12, 2024 · e3e3483 · e3e3483
1 parent ff89df7
commit e3e3483
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 16 deletions.
diff --git a/third_party/airflow/armada/logs/log_consumer.py b/third_party/airflow/armada/logs/log_consumer.py
@@ -1,3 +1,5 @@
+# Copyright 2016-2024 The Apache Software Foundation
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/third_party/airflow/armada/logs/pod_log_manager.py b/third_party/airflow/armada/logs/pod_log_manager.py
@@ -1,3 +1,5 @@
+# Copyright 2016-2024 The Apache Software Foundation
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/third_party/airflow/armada/logs/utils.py b/third_party/airflow/armada/logs/utils.py
@@ -1,3 +1,5 @@
+# Copyright 2016-2024 The Apache Software Foundation
+#
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

diff --git a/third_party/airflow/new/tests/__init__.py → third_party/airflow/test/__init__.py b/third_party/airflow/new/tests/__init__.py → third_party/airflow/test/__init__.py
diff --git a/...y/airflow/new/tests/operators/__init__.py → ..._party/airflow/test/operators/__init__.py b/...y/airflow/new/tests/operators/__init__.py → ..._party/airflow/test/operators/__init__.py
diff --git a/...ty/airflow/tests/operators/test_armada.py → ...rty/airflow/test/operators/test_armada.py b/...ty/airflow/tests/operators/test_armada.py → ...rty/airflow/test/operators/test_armada.py
diff --git a/...ty/airflow/new/tests/triggers/__init__.py → ...d_party/airflow/test/triggers/__init__.py b/...ty/airflow/new/tests/triggers/__init__.py → ...d_party/airflow/test/triggers/__init__.py
diff --git a/...rty/airflow/tests/triggers/test_armada.py → ...arty/airflow/test/triggers/test_armada.py b/...rty/airflow/tests/triggers/test_armada.py → ...arty/airflow/test/triggers/test_armada.py
diff --git a/third_party/airflow/tox.ini b/third_party/airflow/tox.ini
@@ -2,8 +2,6 @@
 isolated_build = true
 envlist =
     format
-    py38
-    py39
     py310
 
 [testenv]
@@ -13,26 +11,26 @@ allowlist_externals =
     find
     xargs
 commands =
-    coverage run -m pytest tests/unit/
+    coverage run -m unittest discover
     coverage xml
     # This executes the dag files in examples but really only checks for imports and python errors
     bash -c "find examples/ -maxdepth 1 -type f -name *.py | xargs python3"
 
 [testenv:format]
 extras = format
 commands =
-    black --check armada/operators tests/ examples/
-#   Disabled until mypy reaches v1.0
+  black armada tests/
+#  Disabled until mypy reaches v1.0
 #   mypy --ignore-missing-imports armada/operators tests/ examples/
-    flake8 armada/operators tests/ examples/
+  flake8 armada/operators tests/
 
-[testenv:format-code]
+[testenv:format-check]
 extras = format
 commands =
-    black armada tests/ examples/
-#  Disabled until mypy reaches v1.0
+    black --check armada/ tests/
+#   Disabled until mypy reaches v1.0
 #   mypy --ignore-missing-imports armada/operators tests/ examples/
-    flake8 armada/operators tests/ examples/
+    flake8 armada/ tests/
 
 [testenv:docs]
 basepython = python3.10
@@ -58,9 +56,3 @@ commands =
     sphinx-build -M jekyll source build
     bash -c "grep -v '^date:' build/jekyll/python_airflow_operator.md > /tmp/python_airflow_operator_generated.md"
     diff /tmp/python_airflow_operator_generated.md ../../../docs/python_airflow_operator.md
-
-[flake8]
-# These settings are recomended by upstream black to make flake8 find black
-# style formatting correct.
-max-line-length = 88
-extend-ignore = E203