@@ -46,12 +46,14 @@ def complete(server):
4646 file_encrypt = WINFILENAMEENCRYPT
4747 filepath = WINFILEPATH
4848 files = ['{}{}' .format (filepath , file ), '{}{}' .format (filepath , file_encrypt )]
49- for x in files :
50- if os .path .exists (x ):
51- os .remove (x )
52- else :
53- print ("The file does not exist" )
54- pass
49+ try :
50+ for x in files :
51+ if os .path .exists (x ):
52+ os .remove (x )
53+ else :
54+ print ("The file does not exist" )
55+ except PermissionError as e :
56+ print (e )
5557
5658@pytest .fixture (scope = "module" )
5759def server (kepware_server ):
@@ -127,10 +129,11 @@ def test_projectsave_service(server: kepconfig.connection.server):
127129 filepath = WINFILEPATH
128130
129131 # Save non-encrypted file
132+ time .sleep (1 )
130133 job = server .save_project (file , None , 60 )
131134 assert type (job ) == kepconfig .connection .KepServiceResponse
132135 time .sleep (1 )
133- status = server .service_status (job )
136+ # status = server.service_status(job)
134137
135138 # Wait for service to be completed
136139 while True :
@@ -140,6 +143,7 @@ def test_projectsave_service(server: kepconfig.connection.server):
140143 assert type (status ) == kepconfig .connection .KepServiceStatus
141144
142145 # Save encrypted file
146+ time .sleep (1 )
143147 job = server .save_project (file_encrypt , FILEPASSWORD , 60 )
144148 assert type (job ) == kepconfig .connection .KepServiceResponse
145149 time .sleep (1 )
@@ -164,6 +168,7 @@ def test_projectload_service(server: kepconfig.connection.server):
164168 filepath = WINFILEPATH
165169
166170 # Load non-encrypted file
171+ time .sleep (1 )
167172 job = server .load_project ('{}{}' .format (filepath , file ), None , 60 )
168173 assert type (job ) == kepconfig .connection .KepServiceResponse
169174
@@ -175,14 +180,19 @@ def test_projectload_service(server: kepconfig.connection.server):
175180 assert type (status ) == kepconfig .connection .KepServiceStatus
176181
177182 # Load encrypted file
183+ time .sleep (1 )
178184 job = server .load_project ('{}{}' .format (filepath , file_encrypt ), FILEPASSWORD , 60 )
179185 assert type (job ) == kepconfig .connection .KepServiceResponse
180- time .sleep (1 )
181- status = server .service_status (job )
182186
183187 # Wait for service to be completed
184188 while True :
185189 time .sleep (1 )
186190 status = server .service_status (job )
187191 if (status .complete == True ): break
188- assert type (status ) == kepconfig .connection .KepServiceStatus
192+ assert type (status ) == kepconfig .connection .KepServiceStatus
193+
194+ def test_get_status (server : kepconfig .connection .server ):
195+ assert type (server .get_status ()) == list
196+
197+ def test_get_info (server : kepconfig .connection .server ):
198+ assert type (server .get_info ()) == dict
0 commit comments