Merge branch 'dev-tests' into dev-tests-cleanup

Author: ethho

tests/conftest.py

@@ -58,6 +58,15 @@ def enable_filepath_feature(monkeypatch):
     monkeypatch.delenv(FILEPATH_FEATURE_SWITCH, raising=True)
 
 
+@pytest.fixture(scope="session")
+def db_creds_test() -> Dict:
+    return dict(
+        host=os.getenv("DJ_TEST_HOST", "fakeservices.datajoint.io"),
+        user=os.getenv("DJ_TEST_USER", "datajoint"),
+        password=os.getenv("DJ_TEST_PASSWORD", "datajoint"),
+    )
+
+
 @pytest.fixture(scope="session")
 def db_creds_root() -> Dict:
     return dict(
@@ -144,7 +153,7 @@ def connection_root(connection_root_bare, prefix):
 
 
 @pytest.fixture(scope="session")
-def connection_test(connection_root, prefix):
+def connection_test(connection_root, prefix, db_creds_test):
     """Test user database connection."""
     database = f"{prefix}%%"
     credentials = dict(
@@ -159,14 +168,14 @@ def connection_test(connection_root, prefix):
         # create user if necessary on mysql8
         connection_root.query(
             f"""
-            CREATE USER IF NOT EXISTS '{credentials["user"]}'@'%%'
-            IDENTIFIED BY '{credentials["password"]}';
+            CREATE USER IF NOT EXISTS '{db_creds_test["user"]}'@'%%'
+            IDENTIFIED BY '{db_creds_test["password"]}';
             """
         )
         connection_root.query(
             f"""
             GRANT {permission} ON `{database}`.*
-            TO '{credentials["user"]}'@'%%';
+            TO '{db_creds_test["user"]}'@'%%';
             """
         )
     else:
@@ -175,14 +184,14 @@ def connection_test(connection_root, prefix):
         connection_root.query(
             f"""
             GRANT {permission} ON `{database}`.*
-            TO '{credentials["user"]}'@'%%'
-            IDENTIFIED BY '{credentials["password"]}';
+            TO '{db_creds_test["user"]}'@'%%'
+            IDENTIFIED BY '{db_creds_test["password"]}';
             """
         )
 
-    connection = dj.Connection(**credentials)
+    connection = dj.Connection(**db_creds_test)
     yield connection
-    connection_root.query(f"""DROP USER `{credentials["user"]}`""")
+    connection_root.query(f"""DROP USER `{db_creds_test["user"]}`""")
     connection.close()
 
 

tests/data/Course.csv

@@ -0,0 +1,46 @@
+dept,course,course_name,credits
+BIOL,1006,World of Dinosaurs,3.0
+BIOL,1010,Biology in the 21st Century,3.0
+BIOL,1030,Human Biology,3.0
+BIOL,1210,Principles of Biology,4.0
+BIOL,2010,Evolution & Diversity of Life,3.0
+BIOL,2020,Principles of Cell Biology,3.0
+BIOL,2021,Principles of Cell Science,4.0
+BIOL,2030,Principles of Genetics,3.0
+BIOL,2210,Human Genetics,3.0
+BIOL,2325,Human Anatomy,4.0
+BIOL,2330,Plants & Society,3.0
+BIOL,2355,Field Botany,2.0
+BIOL,2420,Human Physiology,4.0
+CS,1030,Foundations of Computer Science,3.0
+CS,1410,Introduction to Object-Oriented Programming,4.0
+CS,2100,Discrete Structures,3.0
+CS,2420,Introduction to Algorithms & Data Structures,4.0
+CS,3100,Models of Computation,3.0
+CS,3200,Introduction to Scientific Computing,3.0
+CS,3500,Software Practice,4.0
+CS,3505,Software Practice II,3.0
+CS,3810,Computer Organization,4.0
+CS,4000,Senior Capstone Project - Design Phase,3.0
+CS,4150,Algorithms,3.0
+CS,4400,Computer Systems,4.0
+CS,4500,Senior Capstone Project,3.0
+CS,4940,Undergraduate Research,3.0
+CS,4970,Computer Science Bachelors Thesis,3.0
+MATH,1210,Calculus I,4.0
+MATH,1220,Calculus II,4.0
+MATH,1250,Calculus for AP Students I,4.0
+MATH,1260,Calculus for AP Students II,4.0
+MATH,2210,Calculus III,3.0
+MATH,2270,Linear Algebra,4.0
+MATH,2280,Introduction to Differential Equations,4.0
+MATH,3210,Foundations of Analysis I,4.0
+MATH,3220,Foundations of Analysis II,4.0
+PHYS,2040,Classical Theoretical Physics II,4.0
+PHYS,2060,Quantum Mechanics,3.0
+PHYS,2100,General Relativity and Cosmology,3.0
+PHYS,2140,Statistical Mechanics,4.0
+PHYS,2210,Physics for Scientists and Engineers I,4.0
+PHYS,2220,Physics for Scientists and Engineers II,4.0
+PHYS,3210,Physics for Scientists I (Honors),4.0
+PHYS,3220,Physics for Scientists II (Honors),4.0

tests/data/CurrentTerm.csv

@@ -0,0 +1,2 @@
+omega,term_year,term
+1,2020,Fall

tests/data/Department.csv

@@ -0,0 +1,9 @@
+dept,dept_name,dept_address,dept_phone
+BIOL,Life Sciences,"931 Eric Trail Suite 331
+Lake Scott, CT 53527",(238)497-9162x0223
+CS,Computer Science,"0104 Santos Hill Apt. 497
+Michelleland, MT 94473",3828723244
+MATH,Mathematics,"8358 Bryan Ports
+Lake Matthew, SC 36983",+1-461-767-9298x842
+PHYS,Physics,"7744 Haley Meadows Suite 661
+Lake Eddie, CT 51544",4097052774