update tests (#97)

* update tests

Author: vchrisb

tools/README.md

@@ -28,14 +28,16 @@ The script `tests.py` will run all non altering methods for `pye3dc` for testing
 ### usage
 
 ```
-usage: tests.py [-h] [-c CONFIG] -i IPADDRESS -u USERNAME -p PASSWORD -k KEY
+usage: tests.py [-h] [-c CONFIG] [-m {source,default}] -i IPADDRESS -u USERNAME -p PASSWORD -k KEY
 
 E3DC tests
 
 options:
   -h, --help            show this help message and exit
   -c CONFIG, --config CONFIG
                         config of E3DC
+  -m {source,default}, --module {source,default}
+                        E3DC module source to use for test
 
 required named arguments:
   -i IPADDRESS, --ipaddress IPADDRESS
@@ -54,7 +56,7 @@ The script `testcontainers.py` wil run the `tests`, using docker, for multiple P
 ### usage
 
 ```
-usage: testcontainers.py [-h] [-l LIST] [-c CONFIG] -i IPADDRESS -u USERNAME -p PASSWORD -k KEY
+usage: testcontainers.py [-h] [-l LIST] [-c CONFIG] [-m {source,default}] -i IPADDRESS -u USERNAME -p PASSWORD -k KEY
 
 E3DC testcontainers
 
@@ -63,6 +65,8 @@ options:
   -l LIST, --list LIST  list of Python versions to test with
   -c CONFIG, --config CONFIG
                         config of E3DC
+  -m {source,default}, --module {source,default}
+                        E3DC module source to use for test
 
 required named arguments:
   -i IPADDRESS, --ipaddress IPADDRESS

tools/testcontainers.py

@@ -20,6 +20,7 @@ def __init__(
         password,
         key,
         configuration,
+        module,
         version="3.8",
     ):
         """The init method for Testcontainers."""
@@ -46,6 +47,7 @@ def __init__(
                 "PASSWORD": password,
                 "KEY": key,
                 "CONFIG": configuration,
+                "MODULE": module,
             },
         )
 
@@ -75,6 +77,13 @@ def remove(self):
     default='["3.8", "3.9", "3.10", "3.11", "3.12"]',
 )
 parser.add_argument("-c", "--config", help="config of E3DC", default="{}")
+parser.add_argument(
+    "-m",
+    "--module",
+    help="E3DC module source to use for test",
+    choices=["source", "default"],
+    default="source",
+)
 requiredNamed = parser.add_argument_group("required named arguments")
 requiredNamed.add_argument(
     "-i", "--ipaddress", help="IP address of E3DC", required=True
@@ -92,11 +101,12 @@ def remove(self):
         password=args["password"],
         key=args["key"],
         configuration=args["config"],
+        module=args["module"],
         version=version,
     )
     testcontainers.exec_cmd("pip install .")
     testcontainers.exec_cmd(
-        "sh -c 'python tools/tests.py -i $IPADDRESS -u $USERNAME -p $PASSWORD -k $KEY -c $CONFIG'"
+        "sh -c 'python tools/tests.py -i $IPADDRESS -u $USERNAME -p $PASSWORD -k $KEY -c $CONFIG -m $MODULE'"
     )
     testcontainers.remove()
     print()

tools/tests.py

@@ -2,10 +2,9 @@
 
 import argparse
 import json
+import re
 from datetime import date, datetime
 
-from e3dc import E3DC
-
 
 def json_serial(obj):
     """JSON serializer for objects not serializable by default json code."""
@@ -16,11 +15,21 @@ def json_serial(obj):
 
 def printJson(obj):
     """Print a json object with a datetime obect."""
-    print(json.dumps(obj, indent=2, default=json_serial))
+    output = json.dumps(obj, indent=2, default=json_serial)
+    output = re.sub(r"(.*\"serial.*\": \")(.*)(\",*)", r"\1redacted\3", output, re.M)
+    output = re.sub(r"(.*\"serial.*\": )(\d+)(,*)", r"\g<1>0\g<3>", output, re.M)
+    print(output)
 
 
 parser = argparse.ArgumentParser(description="E3DC tests")
 parser.add_argument("-c", "--config", help="config of E3DC", default="{}")
+parser.add_argument(
+    "-m",
+    "--module",
+    help="E3DC module source to use for test",
+    choices=["source", "default"],
+    default="source",
+)
 requiredNamed = parser.add_argument_group("required named arguments")
 requiredNamed.add_argument(
     "-i", "--ipaddress", help="IP address of E3DC", required=True
@@ -30,8 +39,21 @@ def printJson(obj):
 requiredNamed.add_argument("-k", "--key", help="key of E3DC", required=True)
 args = vars(parser.parse_args())
 
-e3dc = E3DC(
-    E3DC.CONNECT_LOCAL,
+if args["module"] == "source":
+    import sys
+    from pathlib import Path
+
+    sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
+    import e3dc
+
+    print("Running Test for E3DC from sources!\n")
+else:
+    import e3dc
+
+    print("Running Test for E3DC {}\n".format(e3dc.__version__))
+
+e3dc_obj = e3dc.E3DC(
+    e3dc.E3DC.CONNECT_LOCAL,
     ipAddress=args["ipaddress"],
     username=args["username"],
     password=args["password"],
@@ -46,8 +68,10 @@ def printJson(obj):
     "get_db_data",
     "get_system_info",
     "get_system_status",
+    "get_batteries",
     "get_battery_data",
     "get_batteries_data",
+    "get_pvis",
     "get_pvi_data",
     "get_pvis_data",
     "get_powermeters",
@@ -58,6 +82,6 @@ def printJson(obj):
 
 for method in methods:
     print(method + "():")
-    method = getattr(e3dc, method)
+    method = getattr(e3dc_obj, method)
     printJson(method(keepAlive=True))
     print()