solar - no engine. Simplified test setUp/tearDown, min args

valhuber · Dec 9, 2020 · b43c4a9 · b43c4a9
1 parent 95a3095
commit b43c4a9
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 12 deletions.
diff --git a/logic_bank/logic_bank.py b/logic_bank/logic_bank.py
@@ -26,6 +26,8 @@ class LogicBank:
 
     def activate(session: session, activator: callable):
         """
+        register SQLAlchemy listeners
+
         load rules - later executed on commit
 
         raises exception if cycles detected

diff --git a/nw/tests/__init__.py b/nw/tests/__init__.py
@@ -90,7 +90,7 @@ def setUp(test: object, file: str):
     print("\n")
 
 
-def tearDown(file: str, started_at: str, test: object):
+def tearDown(test: object, file: str):
     """
     close session & engine, banner
 
@@ -105,5 +105,5 @@ def tearDown(file: str, started_at: str, test: object):
     print("**********************")
     print("** Test tearDown complete, SQLAlchemy session/engine closed for: " + file)
     print("** Session: " + str(test.session))
-    print("** Started: " + started_at + " Ended: " + str(datetime.now()))
+    print("** Started: " + test.started_at + " Ended: " + str(datetime.now()))
     print("**********************")
diff --git a/nw/tests/test_add_cust.py b/nw/tests/test_add_cust.py
@@ -33,7 +33,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):
         # first delete, so can add

diff --git a/nw/tests/test_add_order.py b/nw/tests/test_add_order.py
@@ -33,7 +33,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):
         pre_cust = self.session.query(models.Customer).filter(models.Customer.Id == "ALFKI").one()

diff --git a/nw/tests/test_dlt_order.py b/nw/tests/test_dlt_order.py
@@ -34,7 +34,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):
 

diff --git a/nw/tests/test_upd_employee_salary.py b/nw/tests/test_upd_employee_salary.py
@@ -34,7 +34,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):
 

diff --git a/nw/tests/test_upd_order_customer.py b/nw/tests/test_upd_order_customer.py
@@ -33,7 +33,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):
 

diff --git a/nw/tests/test_upd_order_required.py b/nw/tests/test_upd_order_required.py
@@ -34,7 +34,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):
 

diff --git a/nw/tests/test_upd_order_reuse.py b/nw/tests/test_upd_order_reuse.py
@@ -34,7 +34,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):
 

diff --git a/nw/tests/test_upd_order_shipped.py b/nw/tests/test_upd_order_shipped.py
@@ -34,7 +34,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):
         self.toggle_order_shipped()

diff --git a/nw/tests/test_upd_order_shipped_auto_commit.py b/nw/tests/test_upd_order_shipped_auto_commit.py
@@ -34,7 +34,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):
         with self.engine.connect().execution_options(autocommit=True) as conn:

diff --git a/nw/tests/test_upd_orderclass_required.py b/nw/tests/test_upd_orderclass_required.py
@@ -34,7 +34,7 @@ def setUp(self):  # banner
         pass
 
     def tearDown(self):
-        tests.tearDown(file=__file__, started_at=self.started_at, test=self)
+        tests.tearDown(test=self, file=__file__)
 
     def test_run(self):