modified fixture inputs to include Kep type

Author: rlabbeptc

tests/admin_test.py

@@ -7,12 +7,13 @@
 # Admin Test - Test to exectute various calls for the Administrator 
 # parts of the Kepware configuration API
 
+from wsgiref.simple_server import server_version
 from kepconfig.error import KepError, KepHTTPError
 import os, sys
 from typing import Dict, List
 import pytest
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-# import kepconfig
+import kepconfig
 from kepconfig import admin
 import json
 import time
@@ -28,6 +29,8 @@
 twx_agent_name = 'Thingworx'
 iot_item_name ="System__Date"
 
+
+
 group1 = {'common.ALLTYPES_NAME': 'Operators'}
 group2 = {'common.ALLTYPES_NAME': 'Group1'}
 group3 = {'common.ALLTYPES_NAME': 'Group2'}
@@ -89,8 +92,10 @@ def complete(server):
 
 
 @pytest.fixture(scope="module")
-def server(kepware_server):
-    server = kepware_server
+def server(kepware_server: list[kepconfig.connection.server, str]):
+    server = kepware_server[0]
+    global server_type
+    server_type = kepware_server[1]
 
     # Initialize any configuration before testing in module
     initialize(server)
@@ -100,10 +105,7 @@ def server(kepware_server):
     complete(server)
 
 def test_uaserver(server):
-    try:
-        server._config_get(server.url + admin.ua_server._create_url())
-    except Exception as err:
-        pytest.skip("UA Endpoints not configurable.")
+    if server_type == 'TKS': pytest.skip("UA Endpoints not configurable in {}.".format(server_type))
 
     assert admin.ua_server.add_endpoint(server,uaendpoint1)
 

tests/conftest.py

@@ -11,5 +11,8 @@
 
 @pytest.fixture(scope="module")
 def kepware_server():
-    return kepconfig.connection.server(host = 'localhost', port = 57412, user = 'Administrator', pw = '', https = False)
-    # return kepconfig.connection.server(host = 'localhost', port = 57413, user = 'Administrator', pw = 'Kepware400400400', https = False)
+    # return [kepconfig.connection.server(host = 'localhost', port = 57412, user = 'Administrator', pw = '', https = False), 'TKS']
+    
+    server = kepconfig.connection.server(host = '127.0.0.1', port = 57513, user = 'Administrator', pw = 'Kepware400400400', https = True)
+    server.SSL_trust_all_certs = True
+    return [server, 'TKE']

tests/connectivity_test.py

@@ -59,8 +59,10 @@ def complete(server):
         HTTPErrorHandler(err)
 
 @pytest.fixture(scope="module")
-def server(kepware_server):
-    server = kepware_server
+def server(kepware_server: list[kepconfig.connection.server, str]):
+    server = kepware_server[0]
+    global server_type
+    server_type = kepware_server[1]
 
     # Initialize any configuration before testing in module
     initialize(server)

tests/datalogger_test.py

@@ -155,6 +155,8 @@ def HTTPErrorHandler(err):
         print('Different Exception Received: {}'.format(err))
 
 def initialize(server: kepconfig.connection.server):
+	if server_type == 'TKE': pytest.skip("Datalogger not configurable in {}.".format(server_type), allow_module_level=True)
+	
 	try:
 		server._config_get(server.url + datalogger.log_group._create_url())
 	except Exception as err:
@@ -169,8 +171,10 @@ def complete(server):
 		HTTPErrorHandler(err)	
 
 @pytest.fixture(scope="module")
-def server(kepware_server):
-    server = kepware_server
+def server(kepware_server: list[kepconfig.connection.server, str]):
+    server = kepware_server[0]
+    global server_type
+    server_type = kepware_server[1]
 
     # Initialize any configuration before testing in module
     initialize(server)

tests/egd_test.py

@@ -118,6 +118,8 @@ def HTTPErrorHandler(err):
 }
 
 def initialize(server: kepconfig.connection.server):
+    if server_type == 'TKE': pytest.skip("EGD not configurable in {}.".format(server_type), allow_module_level=True)
+    
     try:
         server._config_get(server.url +"/doc/drivers/GE Ethernet Global Data/channels")
     except Exception as err:
@@ -135,8 +137,10 @@ def complete(server):
             HTTPErrorHandler(err)
 
 @pytest.fixture(scope="module")
-def server(kepware_server):
-    server = kepware_server
+def server(kepware_server: list[kepconfig.connection.server, str]):
+    server = kepware_server[0]
+    global server_type
+    server_type = kepware_server[1]
 
     # Initialize any configuration before testing in module
     initialize(server)

tests/iot_gateway_test.py

@@ -91,8 +91,10 @@ def complete(server):
             HTTPErrorHandler(err)
 
 @pytest.fixture(scope="module")
-def server(kepware_server):
-    server = kepware_server
+def server(kepware_server: list[kepconfig.connection.server, str]):
+    server = kepware_server[0]
+    global server_type
+    server_type = kepware_server[1]
 
     # Initialize any configuration before testing in module
     initialize(server)